runsidekick · yasinkalafat · Nov 21, 2022 · Nov 21, 2022 · Nov 21, 2022 · Nov 21, 2022
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  publish:
+    name: Release to Maven Central
     runs-on: ubuntu-latest
     steps:
       - name: Check out source
@@ -29,38 +30,21 @@ jobs:
       - name: Configure Maven settings.xml
         uses: whelk-io/maven-settings-xml-action@v21
         with:
-          repositories: >-
-            [
-              {
-                "id": "thundra-releases",
-                "url": "https://repo.thundra.io/content/repositories/thundra-releases"
-              },
-              {
-                "id": "sidekick-releases",
-                "url": "https://repo.thundra.io/content/repositories/sidekick-releases",
-                "releases": {
-                  "enabled": "true"
-                },
-                "snapshots": {
-                  "enabled": "false"
-                }
-              }
-            ]
           servers: >-
             [
               {
-                "id": "thundra-releases",
-                "username": "${{ secrets.THUNDRA_INTERNAL_REPO_USERNAME}}",
-                "password": "${{ secrets.THUNDRA_INTERNAL_REPO_PASSWORD}}"
-              },
-              {
-                "id": "sidekick-releases",
-                "username": "${{ secrets.THUNDRA_INTERNAL_REPO_USERNAME}}",
-                "password": "${{ secrets.THUNDRA_INTERNAL_REPO_PASSWORD}}"
+                "id": "ossrh",
+                "username": "${{ secrets.SIDEKICK_SONATYPE_NEXUS_USERNAME}}",
+                "password": "${{ secrets.SIDEKICK_SONATYPE_NEXUS_PASSWORD}}"
               }
             ]
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v3
+        with:
+          gpg-private-key: ${{ secrets.SIDEKICK_GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.SIDEKICK_GPG_PASSPHRASE}}
 
       - name: Build and Release with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.SIDEKICK_DEVOPS_GITHUB_ACCESS_TOKEN }}
-        run: mvn -q clean install release:clean release:prepare release:perform release:clean --batch-mode -P release
+        run: mvn -X clean package release:clean release:prepare release:perform release:clean --batch-mode -P release
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.runsidekick.agent</groupId>
     <artifactId>sidekick-agent-parent</artifactId>
-    <version>0.0.18-SNAPSHOT</version>
+    <version>0.0.19-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Sidekick Java Agent</name>
@@ -365,51 +365,14 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>com.github.wvengen</groupId>
-                    <artifactId>proguard-maven-plugin</artifactId>
-                    <version>${maven.proguard.plugin.version}</version>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.8</version>
+                    <extensions>true</extensions>
                     <configuration>
-                        <includeDependency>false</includeDependency>
-                        <injar>${project.build.finalName}.jar</injar>
-                        <outjar>${project.build.finalName}.jar</outjar>
-                        <inFilter>!**/module-info.class,!META-INF/versions/9/**</inFilter>
-                        <libs>
-                            <lib>${java.home}/lib/rt.jar</lib>
-                        </libs>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>proguard</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>${maven.release.plugin.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.scm</groupId>
-                            <artifactId>maven-scm-provider-gitexe</artifactId>
-                            <version>1.8.1</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-scm-plugin</artifactId>
-                            <version>1.8.1</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <tagNameFormat>v@{project.version}</tagNameFormat>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <releaseProfiles>releases</releaseProfiles>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <checkModificationExcludes>
-                            <checkModificationExclude>pom.xml</checkModificationExclude>
-                        </checkModificationExcludes>
+                        <serverId>ossrh</serverId>
+                        <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                        <autoReleaseAfterClose>true</autoReleaseAfterClose>
                     </configuration>
                 </plugin>
             </plugins>
@@ -419,40 +382,100 @@
     <profiles>
         <profile>
             <id>release</id>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>sidekick-snapshots</id>
-                    <name>Sidekick Snapshots</name>
-                    <url>https://repo.thundra.io/content/repositories/sidekick-snapshots/</url>
-                    <uniqueVersion>true</uniqueVersion>
-                </snapshotRepository>
-                <repository>
-                    <id>sidekick-releases</id>
-                    <name>Sidekick Releases</name>
-                    <url>https://repo.thundra.io/content/repositories/sidekick-releases/</url>
-                </repository>
-            </distributionManagement>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>3.2.0</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>2.4</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
+                        <version>2.5.3</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.scm</groupId>
+                                <artifactId>maven-scm-provider-gitexe</artifactId>
+                                <version>1.8.1</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-scm-plugin</artifactId>
+                                <version>1.8.1</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <tagNameFormat>v@{project.version}</tagNameFormat>
+                            <scmCommentPrefix>[ci skip] </scmCommentPrefix>
+                            <autoVersionSubmodules>true</autoVersionSubmodules>
+                            <releaseProfiles>release</releaseProfiles>
+                            <useReleaseProfile>false</useReleaseProfile>
+                            <checkModificationExcludes>
+                                <checkModificationExclude>pom.xml</checkModificationExclude>
+                            </checkModificationExcludes>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
 
-    <repositories>
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
         <repository>
-            <id>thundra-releases</id>
-            <name>Thundra Releases</name>
-            <url>https://repo.thundra.io/content/repositories/thundra-releases</url>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
-    </repositories>
+    </distributionManagement>
 
 </project>
diff --git a/sidekick-agent-all/pom.xml b/sidekick-agent-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-api-broker/pom.xml b/sidekick-agent-api-broker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-api-data-redaction/pom.xml b/sidekick-agent-api-data-redaction/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sidekick-agent-parent</artifactId>
         <groupId>com.runsidekick.agent</groupId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidekick-agent-api-logpoint/pom.xml b/sidekick-agent-api-logpoint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-api-tracepoint-integrations-junit4/pom.xml b/sidekick-agent-api-tracepoint-integrations-junit4/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-api-tracepoint-integrations-junit5/pom.xml b/sidekick-agent-api-tracepoint-integrations-junit5/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-api-tracepoint/pom.xml b/sidekick-agent-api-tracepoint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-bootstrap/pom.xml b/sidekick-agent-bootstrap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-broker/pom.xml b/sidekick-agent-broker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-core/pom.xml b/sidekick-agent-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-data-redaction/pom.xml b/sidekick-agent-data-redaction/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sidekick-agent-parent</artifactId>
         <groupId>com.runsidekick.agent</groupId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidekick-agent-instrument/pom.xml b/sidekick-agent-instrument/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-jdk-attach/pom.xml b/sidekick-agent-jdk-attach/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-logpoint/pom.xml b/sidekick-agent-logpoint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-probe-tag/pom.xml b/sidekick-agent-probe-tag/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sidekick-agent-parent</artifactId>
         <groupId>com.runsidekick.agent</groupId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidekick-agent-probe/pom.xml b/sidekick-agent-probe/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>

diff --git a/sidekick-agent-tracepoint/pom.xml b/sidekick-agent-tracepoint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.runsidekick.agent</groupId>
         <artifactId>sidekick-agent-parent</artifactId>
-        <version>0.0.18-SNAPSHOT</version>
+        <version>0.0.19-SNAPSHOT</version>
     </parent>
 
     <groupId>com.runsidekick.agent</groupId>