Merge pull request #361 from domaframework/nexus-publish-plugin

Use the nexus publish plugin

Author: nakamura-to

README.md

@@ -57,8 +57,8 @@ Build with Gradle
 
 ```groovy
 dependencies {
-    implementation "org.seasar.doma:doma:2.29.1-SNAPSHOT"
-    annotationProcessor "org.seasar.doma:doma-processor:2.29.1-SNAPSHOT"
+    implementation "org.seasar.doma:doma:2.30.0-beta-1"
+    annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-1"
 }
 ```
 

build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     signing
     id("com.diffplug.eclipse.apt") version "3.22.0"
     id("com.diffplug.gradle.spotless") version "3.27.2"
+    id("de.marcphilipp.nexus-publish") version "0.4.0"
     id("net.researchgate.release") version "2.8.1"
 }
 
@@ -62,6 +63,13 @@ val processorSourcesJar by tasks.registering(Jar::class) {
     from(sourceSets.main.get().allSource)
 }
 
+val processorJavadocJar by tasks.registering(Jar::class) {
+    dependsOn(javadoc)
+    archiveAppendix.set("processor")
+    archiveClassifier.set("javadoc")
+    from(javadoc.get().destinationDir)
+}
+
 val build by tasks.existing {
     val publishToMavenLocal by tasks.existing
     dependsOn(publishToMavenLocal)
@@ -83,67 +91,52 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
 }
 
+nexusPublishing {
+    repositories {
+        sonatype()
+    }
+}
+
 publishing {
     publications {
-        val main = "main"
-        val processor = "processor"
-        create<MavenPublication>(main) {
+        fun pomDefinition(publicationName: String): MavenPom.() -> Unit {
+            return {
+                val projectUrl: String by project
+                name.set(publicationName)
+                description.set("DAO Oriented Database Mapping Framework for Java 8+")
+                url.set(projectUrl)
+                licenses {
+                    license {
+                        name.set("The Apache Software License, Version 2.0")
+                        url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                    }
+                }
+                developers {
+                    developer {
+                        id.set("nakamura-to")
+                        name.set("Toshihiro Nakamura")
+                        email.set("[email protected]")
+                    }
+                }
+                scm {
+                    val githubUrl: String by project
+                    connection.set("scm:git:${githubUrl}")
+                    developerConnection.set("scm:git:${githubUrl}")
+                    url.set(projectUrl)
+                }
+            }
+        }
+        create<MavenPublication>("main") {
             from(components["java"])
-            pom(pomDefinition(main))
-            repositories(repositoriesDefinition())
+            pom(pomDefinition(name))
         }
-        create<MavenPublication>(processor) {
-            pom(pomDefinition(processor))
+        create<MavenPublication>("processor") {
+            pom(pomDefinition(name))
             val jar = processorJar.get()
-            val sourcesJar = processorSourcesJar.get()
             artifactId = "${jar.archiveBaseName.get()}-${jar.archiveAppendix.get()}"
             artifact(jar)
-            artifact(sourcesJar)
-            repositories(repositoriesDefinition())
-        }
-    }
-}
-
-fun pomDefinition(publicationName: String): MavenPom.() -> Unit {
-    return {
-        val projectUrl: String by project
-        name.set(publicationName)
-        description.set("DAO Oriented Database Mapping Framework for Java 8+")
-        url.set(projectUrl)
-        licenses {
-            license {
-                name.set("The Apache Software License, Version 2.0")
-                url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
-            }
-        }
-        developers {
-            developer {
-                id.set("nakamura-to")
-                name.set("Toshihiro Nakamura")
-                email.set("[email protected]")
-            }
-        }
-        scm {
-            val githubUrl: String by project
-            connection.set("scm:git:${githubUrl}")
-            developerConnection.set("scm:git:${githubUrl}")
-            url.set(projectUrl)
-        }
-    }
-}
-
-fun repositoriesDefinition(): RepositoryHandler.() -> Unit {
-    return {
-        maven {
-            val sonatypeSnapshotUrl: String by project
-            val sonatypeUrl: String by project
-            val sonatypeUsername: String by project
-            val sonatypePassword: String by project
-            url = uri(if (isSnapshot) sonatypeSnapshotUrl else sonatypeUrl)
-            credentials {
-                username = sonatypeUsername
-                password = sonatypePassword
-            }
+            artifact(processorSourcesJar.get())
+            artifact(processorJavadocJar.get())
         }
     }
 }

docs/build.rst

@@ -35,8 +35,8 @@ Write your build.gradle as follows:
 .. code-block:: groovy
 
   dependencies {
-      implementation "org.seasar.doma:doma:2.29.1-SNAPSHOT"
-      annotationProcessor "org.seasar.doma:doma-processor:2.29.1-SNAPSHOT"
+      implementation "org.seasar.doma:doma:2.30.0-beta-1"
+      annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-1"
   }
 
 To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.

docs/kotlin-support.rst

@@ -99,8 +99,8 @@ Add the dependencies using the `kapt` and `implementation` configuration in your
 .. code-block:: groovy
 
   dependencies {
-      implementation "org.seasar.doma:doma:2.29.1-SNAPSHOT"
-      kapt "org.seasar.doma:doma-processor:2.29.1-SNAPSHOT"
+      implementation "org.seasar.doma:doma:2.30.0-beta-1"
+      kapt "org.seasar.doma:doma-processor:2.30.0-beta-1"
   }
 
 To simplify your build.script, we recommend you use

gradle.properties

@@ -1,9 +1,8 @@
 group=org.seasar.doma
-version=2.29.1-SNAPSHOT
+version=2.30.0-beta-1
 encoding=UTF-8
+systemProp.org.gradle.internal.publish.checksums.insecure=true
 projectUrl=https://github.com/domaframework/doma
 githubUrl[email protected]:domaframework/doma.git
-sonatypeUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-sonatypeSnapshotUrl=https://oss.sonatype.org/content/repositories/snapshots/
 sonatypeUsername=
 sonatypePassword=

src/main/java/org/seasar/doma/internal/Artifact.java

@@ -7,7 +7,7 @@ public final class Artifact {
 
   private static final String NAME = "Doma";
 
-  private static final String VERSION = "2.29.1-SNAPSHOT";
+  private static final String VERSION = "2.30.0-beta-1";
 
   public static String getName() {
     return NAME;