-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade jackson, shaded, gradle versions (#395)
* initial attempt to upgrade jackson, shaded, gradle versions * build: experiment * update plugin version * cleanup * cleanup * shade snakeyaml and jackson --------- Co-authored-by: Aaron Steinfeld <aaron@traceable.ai>
- Loading branch information
1 parent
bf443ae
commit 2a24d17
Showing
31 changed files
with
145 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,105 +1,83 @@ | ||
| import org.hypertrace.gradle.publishing.License.APACHE_2_0; | ||
|
|
||
| plugins { | ||
| `java-library` | ||
| id("com.diffplug.spotless") version "5.2.0" apply false | ||
| id("org.hypertrace.publish-maven-central-plugin") version "1.0.4" apply false | ||
| id("org.hypertrace.ci-utils-plugin") version "0.3.0" | ||
| id("org.gradle.test-retry") version "1.2.0" apply false | ||
| id("org.owasp.dependencycheck") version "7.1.1" | ||
| id("com.diffplug.spotless") version "5.2.0" apply false | ||
| id("org.hypertrace.publish-maven-central-plugin") version "1.0.6" | ||
| id("org.hypertrace.ci-utils-plugin") version "0.3.0" | ||
| id("org.gradle.test-retry") version "1.2.0" apply false | ||
| id("org.owasp.dependencycheck") version "7.1.1" | ||
| } | ||
|
|
||
| buildscript { | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| apply(plugin="java-library") | ||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| subprojects { | ||
| group = "org.hypertrace.agent" | ||
| description = "Hypertrace OpenTelemetry Javaagent" | ||
|
|
||
| apply(plugin = "java-library") | ||
| apply(plugin = "com.diffplug.spotless") | ||
| apply(from = "$rootDir/gradle/spotless.gradle") | ||
| pluginManager.withPlugin("java-library") { | ||
| configure<JavaPluginExtension> { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| mavenCentral() | ||
| maven { | ||
| url = uri("https://oss.sonatype.org/content/repositories/snapshots/") | ||
| } | ||
| } | ||
|
|
||
| tasks.compileJava { | ||
| options.compilerArgs.add("-Werror") | ||
| tasks.named<JavaCompile>("compileJava") { | ||
| options.compilerArgs.add("-Werror") | ||
| } | ||
|
|
||
|
|
||
| tasks.withType<JavaCompile> { | ||
| options.compilerArgs.add("-Xlint:unchecked") | ||
| options.isDeprecation = true | ||
| options.release.set(8) | ||
| options.compilerArgs.add("-Xlint:unchecked") | ||
| options.isDeprecation = true | ||
| options.release.set(8) | ||
| } | ||
| } | ||
|
|
||
| val testDependencies by configurations.creating { | ||
| extendsFrom(configurations.testImplementation.get()) | ||
| extendsFrom(configurations.testRuntimeOnly.get()) | ||
| } | ||
|
|
||
| subprojects { | ||
| group = "org.hypertrace.agent" | ||
| description = "Hypertrace OpenTelemetry Javaagent" | ||
|
|
||
| extra.set("versions", mapOf( | ||
| // when updating these values, some values must also be updated in buildSrc as this map | ||
| // cannot be accessed there | ||
| "opentelemetry" to "1.24.0", | ||
| "opentelemetry_semconv" to "1.24.0-alpha", | ||
| "opentelemetry_proto" to "0.11.0-alpha", | ||
| "opentelemetry_java_agent" to "1.24.0-alpha", | ||
| "opentelemetry_java_agent_all" to "1.24.0", | ||
| "opentelemetry_java_agent-tooling" to "1.24.0-alpha", | ||
|
|
||
| "opentelemetry_gradle_plugin" to "1.24.0-alpha", | ||
| "byte_buddy" to "1.12.10", | ||
| "slf4j" to "2.0.7" | ||
| )) | ||
|
|
||
| apply<JavaPlugin>() | ||
| apply(plugin = "com.diffplug.spotless") | ||
| apply(from = "$rootDir/gradle/spotless.gradle") | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| jcenter() | ||
| maven { | ||
| url = uri("https://oss.sonatype.org/content/repositories/snapshots/") | ||
| } | ||
| dependencies { | ||
| add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.junit.jupiter:junit-jupiter-api:5.7.0") | ||
| add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.jupiter:junit-jupiter-engine:5.7.0") | ||
| add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.junit-pioneer:junit-pioneer:1.0.0") | ||
| } | ||
|
|
||
| pluginManager.withPlugin("org.hypertrace.publish-maven-central-plugin") { | ||
| configure<org.hypertrace.gradle.publishing.HypertracePublishMavenCentralExtension> { | ||
| repoName.set("javaagent") | ||
| license.set(APACHE_2_0) | ||
| } | ||
| tasks.named<Test>("test") { | ||
| useJUnitPlatform() | ||
| reports { | ||
| junitXml.isOutputPerTestCase = true | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") | ||
| testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") | ||
| testImplementation("org.junit-pioneer:junit-pioneer:1.0.0") | ||
| } | ||
| extra.set("versions", mapOf( | ||
| // when updating these values, some values must also be updated in buildSrc as this map | ||
| // cannot be accessed there | ||
| "opentelemetry" to "1.24.0", | ||
| "opentelemetry_semconv" to "1.24.0-alpha", | ||
| "opentelemetry_proto" to "0.11.0-alpha", | ||
| "opentelemetry_java_agent" to "1.24.0-alpha", | ||
| "opentelemetry_java_agent_all" to "1.24.0", | ||
| "opentelemetry_java_agent-tooling" to "1.24.0-alpha", | ||
|
|
||
| "opentelemetry_gradle_plugin" to "1.24.0-alpha", | ||
| "byte_buddy" to "1.12.10", | ||
| "slf4j" to "2.0.7" | ||
| )) | ||
| } | ||
|
|
||
| tasks { | ||
| test { | ||
| useJUnitPlatform() | ||
| reports { | ||
| junitXml.isOutputPerTestCase = true | ||
| } | ||
| } | ||
| pluginManager.withPlugin("org.hypertrace.publish-maven-central-plugin") { | ||
| configure<org.hypertrace.gradle.publishing.HypertracePublishMavenCentralExtension> { | ||
| repoName.set("javaagent") | ||
| license.set(APACHE_2_0) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencyCheck { | ||
| format = org.owasp.dependencycheck.reporting.ReportGenerator.Format.valueOf("ALL") | ||
| format = org.owasp.dependencycheck.reporting.ReportGenerator.Format.valueOf("ALL") | ||
| // suppressionFile = "owasp-suppressions.xml" | ||
| scanConfigurations.add("runtimeClasspath") | ||
| failBuildOnCVSS = 7.0F | ||
| scanConfigurations.add("runtimeClasspath") | ||
| failBuildOnCVSS = 7.0F | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.