1

Author: dkropachev

.github/workflows/release.yml

@@ -3,9 +3,9 @@ name: Release scylla-cdc-java
 on:
   workflow_dispatch:
     inputs:
-      dryrun:
+      dry-run:
         type: boolean
-        description: 'dryrun: run without pushing SCM changes to upstream'
+        description: 'dry-run: run without pushing SCM changes to upstream'
         default: false
 
       skip-tests:
@@ -77,14 +77,16 @@ jobs:
           SONATYPE_TOKEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_USERNAME }}
           SONATYPE_TOKEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }}
         run: |
-          if [[ "${{ inputs.dryrun }}" == "true" ]]; then
-            MAVEN_OPTS="${MAVEN_OPTS} -DdryRun=true"
+          DRY_RUN_OPTS=""
+          if [[ "${{ inputs.dry-run }}" != "true" ]]; then
+            DRY_RUN_OPTS="-Drelease.autopublish=true"
           fi
           if [[ "${{ inputs.skip-tests }}" == "true" ]]; then
             MAVEN_OPTS="${MAVEN_OPTS} -DskipTests=true -DskipITs=true"
           fi
           export MAVEN_OPTS
-          $MVNCMD release:perform -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} > >(tee /tmp/logs-stdout.log) 2> >(tee /tmp/logs-stderr.log)
+          echo MAVEN_OPTS=$MAVEN_OPTS $MVNCMD release:perform $DRY_RUN_OPTS
+          $MVNCMD release:perform $DRY_RUN_OPTS -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} > >(tee /tmp/logs-stdout.log) 2> >(tee /tmp/logs-stderr.log)
 
       - name: Upload stdout.log
         if: failure()
@@ -101,7 +103,7 @@ jobs:
           path: /tmp/logs-stderr.log
 
       - name: Push changes to SCM
-        if: ${{ inputs.dryrun == 'false' && inputs.target-tag == 'master' }}
+        if: ${{ inputs.dry-run == 'false' && inputs.target-tag == 'master' }}
         run: |
           git status && git log -3
           git push origin --follow-tags -v

pom.xml

@@ -12,12 +12,8 @@
     <modules>
         <module>scylla-cdc-base</module>
         <module>scylla-cdc-lib</module>
-<!--
-        Find a way to disable more than one plugin via central-publishing-maven-plugin configuration.
-
         <module>scylla-cdc-replicator</module>
         <module>scylla-cdc-printer</module>
--->
         <module>scylla-cdc-driver3</module>
     </modules>
 
@@ -27,6 +23,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <flogger.version>0.8</flogger.version>
         <gpg.passphrase/>
+        <release.autopublish>false</release.autopublish>
     </properties>
 
     <dependencyManagement>
@@ -86,12 +83,11 @@
                     <configuration>
                         <tagNameFormat>scylla-cdc-@{project.version}</tagNameFormat>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <!-- useReleaseProfile>false</useReleaseProfile>
                         <releaseProfiles>release</releaseProfiles>
-                        <goals>deploy</goals-->
+                        <useReleaseProfile>false</useReleaseProfile>
                         <localCheckout>true</localCheckout>
                         <pushChanges>false</pushChanges>
-                        <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
+                        <arguments>-Dgpg.passphrase=${gpg.passphrase} -Drelease.autopublish=${release.autopublish}</arguments>
                     </configuration>
                     <dependencies>
                         <dependency>
@@ -104,19 +100,6 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.central</groupId>
-                <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.7.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <publishingServerId>central</publishingServerId>
-                    <autoPublish>true</autoPublish>
-                    <skipPublishing>false</skipPublishing>
-                    <waitForPublishCompletion>true</waitForPublishCompletion>
-                    <waitUntil>validated</waitUntil>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -142,6 +125,18 @@
                 <artifactId>maven-release-plugin</artifactId>
                 <version>3.1.1</version>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.8.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                    <excludeArtifacts>scylla-cdc-printer,scylla-cdc-replicator</excludeArtifacts>
+                    <autoPublish>${release.autopublish}</autoPublish>
+                    <waitUntil>validated</waitUntil>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -163,7 +158,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.4</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -193,8 +188,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!--
-                    TODO: re-enable when there are javadocs.
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <executions>
@@ -206,11 +199,9 @@
                             </execution>
                         </executions>
                     </plugin>
-                    -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.4</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>