NH-37575: use flat dir dependency for joboe stuff

.github/workflows/smoke-test.yml

@@ -21,20 +21,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-      - name: Clone apm-java-test-apps
-        uses: actions/checkout@v4
-        with:
-          repository: appoptics/apm-java-test-apps
-          path: ./apm-java-test-apps
-          token: ${{ secrets.GP_TOKEN }}
-          ref: cc/local
       - name: Run application
-        working-directory: apm-java-test-apps
+        working-directory: smoke-tests
         run: |
           ./gradlew :netty-test:run
         env:
-          SW_APM_COLLECTOR: apm.collector.cloud.solarwinds.com
-          SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }}:chubi-test
+          SW_APM_COLLECTOR: apm.collector.st-ssp.solarwinds.com
+          SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY_STAGE }}:chubi-test
 
   smoke-test-windows:
     runs-on: windows-latest
@@ -47,15 +40,8 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-      - name: Clone apm-java-test-apps
-        uses: actions/checkout@v4
-        with:
-          repository: appoptics/apm-java-test-apps
-          path: ./apm-java-test-apps
-          token: ${{ secrets.GP_TOKEN }}
-          ref: cc/local
       - name: Run application
-        working-directory: apm-java-test-apps
+        working-directory: smoke-tests
         run: |
           .\gradlew.bat :netty-test:run
         env:

agent/build.gradle

@@ -154,66 +154,3 @@ tasks.register('javadocJar', Jar) {
   }
   archiveClassifier.set("javadoc")
 }
-
-publishing {
-  publications {
-    mavenJava(MavenPublication) {
-      pom {
-        name = "${archivesBaseName}"
-        description = "${archivesBaseName}"
-        url = "www.solarwinds.com"
-        scm {
-          url = 'https://github.com/solarwinds/apm-java/'
-        }
-        developers {
-          developer {
-            id = 'APM'
-            name = 'The APM Library team'
-          }
-        }
-        licenses {
-          license {
-            name = 'Apache License, Version 2.0'
-          }
-        }
-        groupId = 'com.solarwinds'
-        artifactId = "${archivesBaseName}"
-        version = "${versions.agent}"
-        from components.java
-        artifact sourcesJar
-        artifact javadocJar
-      }
-    }
-
-    publishToMavenLocal
-  }
-  repositories {
-//    -- uncomment the lines below to publish the agent artifact to the Maven central --
-//    maven {
-//      name = "OSSRH"
-//      url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
-//      credentials {
-//        username = System.getenv("SONATYPE_USERNAME")
-//        password = System.getenv("SONATYPE_TOKEN")
-//      }
-//    }
-    maven {
-      name = "GitHubPackages"
-      url = "https://maven.pkg.github.com/solarwinds-cloud/maven-releases"
-      credentials {
-        username = System.getenv("GITHUB_USERNAME")
-        password = System.getenv("GITHUB_TOKEN")
-      }
-    }
-  }
-}
-
-signing {
-  setRequired {
-    gradle.taskGraph.allTasks.any { (it.getClass() == PublishToMavenRepository.class) }
-  }
-  def signingKey = System.getenv("GPG_PRIVATE_KEY")
-  def signingPassword = System.getenv("GPG_PRIVATE_KEY_PASSPHRASE")
-  useInMemoryPgpKeys(signingKey, signingPassword)
-  sign publishing.publications.mavenJava
-}

build.gradle

@@ -44,10 +44,11 @@ subprojects {
                 opentelemetryJavaagent: "2.3.0",
                 bytebuddy             : "1.12.10",
                 guava                 : "30.1-jre",
-                joboe                 : "10.0.4",
+                joboe: "10.0.5",
                 agent                 : "2.3.1", // the custom distro agent version
                 autoservice           : "1.0.1",
                 caffeine              : "2.9.3",
+                json : "20231013",
         ]
         versions.opentelemetryAlpha = "${versions.opentelemetry}-alpha"
         versions.opentelemetrySemconv = "1.21.0-alpha"
@@ -66,15 +67,11 @@ subprojects {
         maven {
             url = uri("https://oss.sonatype.org/content/repositories/snapshots")
         }
-        maven {
-            url = uri("https://maven.pkg.github.com/solarwinds-cloud/maven-releases")
-            credentials {
-                username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
-                password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
-            }
-        }
         mavenLocal()
         mavenCentral()
+        flatDir {
+            dirs("$rootDir/libs")
+        }
     }
 
     dependencies {

custom/build.gradle

@@ -34,7 +34,8 @@ dependencies {
   annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
 
   testImplementation project(path: ":custom:shared")
-  testImplementation("org.json:json:20231013")
+  testImplementation("org.json:json:${versions.json}")
+  testImplementation "com.solarwinds.joboe:core:${versions.joboe}"
 }
 
 tasks.withType(Checkstyle).configureEach {

custom/lambda/build.gradle

@@ -22,6 +22,7 @@ dependencies {
   annotationProcessor 'org.projectlombok:lombok:1.18.28'
   compileOnly "com.solarwinds.joboe:config:${versions.joboe}"
   compileOnly "com.solarwinds.joboe:sampling:${versions.joboe}"
+  compileOnly "com.solarwinds.joboe:logging:${versions.joboe}"
 
   annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
   compileOnly "com.google.auto.service:auto-service-annotations:1.0.1"
@@ -35,7 +36,8 @@ dependencies {
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
 
   testImplementation project(path: ":custom:shared")
-  testImplementation("org.json:json:20231013")
+  testImplementation "org.json:json:${versions.json}"
+  testImplementation "com.solarwinds.joboe:sampling:${versions.joboe}"
 }
 
 test {

custom/shared/build.gradle

@@ -37,9 +37,12 @@ dependencies {
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
 
+  implementation "org.json:json:${versions.json}"
   implementation "com.google.code.gson:gson:2.10.1"
   implementation "com.github.ben-manes.caffeine:caffeine:${versions.caffeine}"
-  testImplementation("org.json:json:20231013")
+
+  testImplementation("org.json:json:${versions.json}")
+  testImplementation "com.solarwinds.joboe:sampling:${versions.joboe}"
 }
 
 test {

instrumentation/jdbc/build.gradle

@@ -20,8 +20,10 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 dependencies {
   compileOnly project(":bootstrap")
   compileOnly "com.solarwinds.joboe:config:${versions.joboe}"
-  compileOnly "io.opentelemetry:opentelemetry-sdk-trace:${versions.opentelemetry}"
+  compileOnly "com.solarwinds.joboe:logging:${versions.joboe}"
+  compileOnly "org.json:json:${versions.json}"
 
+  compileOnly "io.opentelemetry:opentelemetry-sdk-trace:${versions.opentelemetry}"
   compileOnly "io.opentelemetry.semconv:opentelemetry-semconv:${versions.opentelemetrySemconv}"
   compileOnly "com.github.ben-manes.caffeine:caffeine:${versions.caffeine}"
 

solarwinds-otel-sdk/build.gradle

@@ -104,14 +104,6 @@ publishing {
         password = System.getenv("SONATYPE_TOKEN")
       }
     }
-    maven {
-      name = "GitHubPackages"
-      url = "https://maven.pkg.github.com/solarwinds-cloud/maven-releases"
-      credentials {
-        username = System.getenv("GITHUB_USERNAME")
-        password = System.getenv("GITHUB_TOKEN")
-      }
-    }
   }
 }