Merge pull request #16 from linkedin/rakhi/jFrog

Add LinkedIn JFrog Artifactory publishing and cleanup

Author: rakhiagr

.github/actions/release/action.yml

@@ -12,7 +12,7 @@ runs:
       shell: bash
     - run: echo Got version ${{ steps.get-tag.outputs.tag }}
       shell: bash
-    - run: ./gradlew build -x integrationTest publishToMavenLocal artifactoryPublish -Partifactory.dryRun
+    - run: ./gradlew build -x integrationTest publishToMavenLocal artifactoryPublish -Partifactory.dryRun --no-configuration-cache
       shell: bash
-    - run: ./gradlew ciPerformRelease
+    - run: ./gradlew ciPerformRelease --no-configuration-cache
       shell: bash

.m2/settings.xml

@@ -4,12 +4,12 @@
   <servers>
     <server>
       <username>${env.ARTIFACTORY_USER}</username>
-      <password>$(env.ARTIFACTORY_KEY}</password>
+      <password>${env.ARTIFACTORY_KEY}</password>
       <id>central</id>
     </server>
     <server>
       <username>${env.ARTIFACTORY_USER}</username>
-      <password>$(env.ARTIFACTORY_KEY}</password>
+      <password>${env.ARTIFACTORY_KEY}</password>
       <id>snapshots</id>
     </server>
   </servers>
@@ -22,13 +22,13 @@
           </snapshots>
           <id>central</id>
           <name>release</name>
-          <url>https://linkedin.jfrog.io/artifactory/release</url>
+          <url>https://linkedin.jfrog.io/artifactory/ignite</url>
         </repository>
         <repository>
           <snapshots />
           <id>snapshots</id>
           <name>remote-repos</name>
-          <url>https://linkedin.jfrog.io/artifactory/remote-repos</url>
+          <url>https://linkedin.jfrog.io/artifactory/ignite</url>
         </repository>
       </repositories>
       <pluginRepositories>
@@ -38,13 +38,13 @@
           </snapshots>
           <id>central</id>
           <name>release</name>
-          <url>https://linkedin.jfrog.io/artifactory/release</url>
+          <url>https://linkedin.jfrog.io/artifactory/ignite</url>
         </pluginRepository>
         <pluginRepository>
           <snapshots />
           <id>snapshots</id>
           <name>remote-repos</name>
-          <url>https://linkedin.jfrog.io/artifactory/remote-repos</url>
+          <url>https://linkedin.jfrog.io/artifactory/ignite</url>
         </pluginRepository>
       </pluginRepositories>
       <id>artifactory</id>

build.gradle

@@ -21,6 +21,7 @@ buildscript {
     dependencies {
         classpath "org.shipkit:shipkit-auto-version:1.1.1"
         classpath "org.shipkit:shipkit-changelog:1.1.1"
+        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.24.5"
     }
 }
 //This need for resolving plugins in buildscripts
@@ -171,10 +172,7 @@ allprojects {
 // Apply common configuration to all subprojects
 subprojects {
     apply plugin: 'base'
-    
-    // Apply publishing configuration to relevant modules
-    apply from: "$rootDir/gradle/publishing.gradle"
-    
+
     repositories {
         maven {
             url = uri('https://repo.maven.apache.org/maven2/')

buildscripts/publishing.gradle

@@ -16,16 +16,88 @@
  */
 
 apply plugin: 'signing'
+apply plugin: 'com.jfrog.artifactory'
 apply from: "$rootDir/buildscripts/publishing-repos.gradle"
 
 publishing {
   publications {
     maven(MavenPublication) {
       from components.java
+      // Note: sourcesJar and javadocJar are automatically included via java-core.gradle's
+      // withSourcesJar() and withJavadocJar() configuration
     }
   }
 }
 
 signing {
   sign publishing.publications
 }
+
+////////////////////////////////////////////////
+// Artifactory publishing
+////////////////////////////////////////////////
+
+// Configure Artifactory after evaluation to avoid serialization issues
+afterEvaluate {
+  artifactory {
+    contextUrl = 'https://linkedin.jfrog.io/artifactory'
+    publish {
+      repository {
+        repoKey = 'ignite'
+        username = System.getenv('ARTIFACTORY_USER')
+        password = System.getenv('ARTIFACTORY_KEY')
+        maven = true
+      }
+
+      defaults {
+        // Use publication names as strings, not objects
+        publications('maven')
+        publishArtifacts = true
+        publishPom = true
+      }
+    }
+
+    resolve {
+      repository {
+        repoKey = 'release'
+        username = System.getenv('ARTIFACTORY_USER')
+        password = System.getenv('ARTIFACTORY_KEY')
+        maven = true
+      }
+    }
+  }
+
+  tasks.named('artifactoryPublish').configure {
+    skip = project.hasProperty('artifactory.dryRun')
+
+    // Always re-run this task, don't use up-to-date checks
+    outputs.upToDateWhen { false }
+
+    doFirst {
+      if (project.hasProperty('artifactory.dryRun')) {
+        logger.lifecycle("DRY RUN: Would publish ${project.name} to Artifactory")
+      } else {
+        logger.lifecycle("Publishing ${project.name} to Artifactory at https://linkedin.jfrog.io/artifactory")
+        logger.lifecycle("  Repository: ignite")
+        logger.lifecycle("  User: ${System.getenv('ARTIFACTORY_USER') ?: 'NOT SET'}")
+
+        // Log the actual artifacts being published
+        def mavenPub = project.publishing.publications.findByName('maven')
+        if (mavenPub) {
+          logger.lifecycle("  Artifacts to upload:")
+          mavenPub.artifacts.each { artifact ->
+            def file = artifact.file
+            def size = file.exists() ? String.format("%.2f KB", file.length() / 1024.0) : "N/A"
+            logger.lifecycle("    - ${file.name} (${size})")
+          }
+        }
+      }
+    }
+
+    doLast {
+      if (!project.hasProperty('artifactory.dryRun')) {
+        logger.lifecycle("✓ Completed publishing ${project.name} to Artifactory")
+      }
+    }
+  }
+}

gradle/ci-release.gradle

@@ -17,12 +17,28 @@ task verifyArtifactoryProperties {
 task artifactoryPublishAll {
   description = "Runs 'artifactoryPublish' tasks from all projects"
   mustRunAfter "githubRelease" // github release is easier to rollback so we run it first
+
+  doFirst {
+    def publishTasks = []
+    subprojects.each { subproject ->
+      if (subproject.tasks.findByName('artifactoryPublish')) {
+        publishTasks.add(subproject.path)
+      }
+    }
+    println "Publishing ${publishTasks.size()} modules to Artifactory: ${publishTasks}"
+  }
+
+  doLast {
+    println "All artifacts published to Artifactory"
+  }
 }
 
-allprojects {
-  tasks.matching { it.name == "artifactoryPublish" }.all {
-    it.dependsOn verifyArtifactoryProperties
-    artifactoryPublishAll.dependsOn it
+subprojects {
+  afterEvaluate { project ->
+    if (project.tasks.findByName('artifactoryPublish')) {
+      project.tasks.artifactoryPublish.dependsOn rootProject.tasks.verifyArtifactoryProperties
+      rootProject.tasks.artifactoryPublishAll.dependsOn project.tasks.artifactoryPublish
+    }
   }
 }