Update dependencies (#27)

* Update dependencies

* Regenerate license report.

* Add directions on updates

Author: anuraaga

.gitattributes

@@ -2,3 +2,5 @@
 
 *.bat text eol=crlf
 *.cmd text eol=crlf
+
+licenses/** linguist-generated

RELEASING.md

@@ -1,5 +1,15 @@
 # AWS OpenTelemetry Java Instrumentation Release Process
 
+## Preparing for a release
+
+Before beginning a release, make sure dependencies are updated.
+
+Run `./gradlew dependencyUpdates` to get a report on what dependencies have updates and apply them to
+`dependencyManagement` and `settings.gradle.kts`.
+
+Then, run `./gradlew generateLicenseReport` to update our licenses to reflect the update. Send a PR
+and merge.
+
 ## Starting the Release
 
 Open the release build workflow in your browser [here](https://github.com/aws-observability/aws-otel-java-instrumentation/actions?query=workflow%3A%22Release+Build%22).

awsagentprovider/build.gradle.kts

@@ -15,7 +15,7 @@
 
 plugins {
   java
-  id("com.github.johnrengelman.shadow") version "5.2.0"
+  id("com.github.johnrengelman.shadow")
 }
 
 base {

build.gradle.kts

@@ -18,10 +18,12 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
   java
-  id("nebula.release") version "15.1.0"
-  id("io.codearte.nexus-staging") version "0.22.0"
-  id("com.diffplug.spotless") version "5.1.2"
-  id("com.github.jk1.dependency-license-report") version "1.14"
+
+  id("com.diffplug.spotless")
+  id("com.github.ben-manes.versions")
+  id("com.github.jk1.dependency-license-report")
+  id("io.codearte.nexus-staging")
+  id("nebula.release")
 }
 
 val releaseTask = tasks.named("release")
@@ -57,7 +59,10 @@ allprojects {
 
   spotless {
     kotlinGradle {
-      ktlint("0.38.0").userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
+      ktlint("0.40.0").userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
+
+      // Doesn't support pluginManagement block
+      targetExclude("settings.gradle.kts")
 
       if (!project.path.startsWith(":sample-apps:")) {
         licenseHeaderFile("${rootProject.projectDir}/config/license/header.java", "plugins|include|import")
@@ -215,10 +220,19 @@ allprojects {
   }
 }
 
-tasks.named<Wrapper>("wrapper") {
-  gradleVersion = "6.6.1"
-  distributionType = Wrapper.DistributionType.ALL
-  distributionSha256Sum = "11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5"
+tasks {
+  named<Wrapper>("wrapper") {
+    gradleVersion = "6.7.1"
+    distributionSha256Sum = "3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d"
+  }
+
+  val cleanLicenseReport by registering(Delete::class) {
+    delete("licenses")
+  }
+
+  named("generateLicenseReport") {
+    dependsOn(cleanLicenseReport)
+  }
 }
 
 licenseReport {

dependencyManagement/build.gradle.kts

@@ -22,19 +22,16 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 val DEPENDENCY_BOMS = listOf(
-  "com.amazonaws:aws-xray-recorder-sdk-bom:2.6.1",
-  "com.fasterxml.jackson:jackson-bom:2.11.0",
-  "com.google.protobuf:protobuf-bom:3.13.0",
-  "com.linecorp.armeria:armeria-bom:1.0.0",
-  "io.grpc:grpc-bom:1.30.2",
+  "com.fasterxml.jackson:jackson-bom:2.12.0",
+  "com.google.protobuf:protobuf-bom:3.14.0",
+  "com.linecorp.armeria:armeria-bom:1.3.0",
+  "io.grpc:grpc-bom:1.34.0",
   "io.opentelemetry:opentelemetry-bom:0.11.0",
-  "io.zipkin.brave:brave-bom:5.12.3",
-  "io.zipkin.reporter2:zipkin-reporter-bom:2.15.0",
-  "org.apache.logging.log4j:log4j-bom:2.13.3",
-  "org.junit:junit-bom:5.7.0-RC1",
-  "org.springframework.boot:spring-boot-dependencies:2.3.3.RELEASE",
-  "org.testcontainers:testcontainers-bom:1.15.0-rc2",
-  "software.amazon.awssdk:bom:2.13.17"
+  "org.apache.logging.log4j:log4j-bom:2.14.0",
+  "org.junit:junit-bom:5.7.0",
+  "org.springframework.boot:spring-boot-dependencies:2.4.0",
+  "org.testcontainers:testcontainers-bom:1.15.0",
+  "software.amazon.awssdk:bom:2.15.40"
 )
 
 val DEPENDENCY_SETS = listOf(
@@ -72,6 +69,7 @@ val DEPENDENCY_SETS = listOf(
 )
 
 val DEPENDENCIES = listOf(
+  "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.3",
   "com.squareup.okhttp3:okhttp:3.14.9"
 )

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists