Skip to content

Commit

Permalink
Merge branch '1.9.x' into 1.10.x
Browse files Browse the repository at this point in the history
Changes specific to 1.10.x as part of TOML conversion:
* Mockito-inline removed; this is included in mockito-core and no longer released[1]
* Jackson upgraded from RC release to latest patch in minor (2.14.2).
* Mongo 4.8.0-beta0 to 4.8.2
* Hazelcast 5.2-BETA-1 to 5.2.4
* [otlp] uk.org.webcompere:system-stubs-jupiter 2.0.2 to 2.1.3 to get rid of old mockito-inline dependency
* Jakarta servlet-api consistently is 5.0.0 now instead of a mix of 4.0.4 and 5.0.0
* Remove unused test dependencies from micrometer-commons

I compared the lockfiles that would be generated with this to the previous lockfiles. Only the above mentioned changes (and spotless plugin related scope differences) were found as different between the two.

[1] mockito/mockito#2945
  • Loading branch information
shakuzen committed Oct 4, 2023
2 parents afa255e + ec5b238 commit 94a17e0
Show file tree
Hide file tree
Showing 56 changed files with 339 additions and 5,571 deletions.
10 changes: 5 additions & 5 deletions benchmarks/benchmarks-core/build.gradle
Expand Up @@ -6,19 +6,19 @@ dependencies {
jmh project(':micrometer-core')
jmh project(':micrometer-registry-prometheus')

jmh 'io.dropwizard.metrics5:metrics-core:latest.release'
jmh 'io.prometheus:simpleclient_common:latest.release'
jmh libs.dropwizardMetricsCore5
jmh libs.prometheusClient

jmh 'io.dropwizard.metrics:metrics-core'
jmh 'com.google.guava:guava'

jmh 'org.openjdk.jmh:jmh-core:latest.release'
jmh libs.jmhCore

jmh 'ch.qos.logback:logback-classic'

// Nebula doesn't like having jmhAnnotationProcessor without jmh so we just add it twice.
jmh 'org.openjdk.jmh:jmh-generator-annprocess:latest.release'
jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:latest.release'
jmh libs.jmhAnnotationProcessor
jmhAnnotationProcessor libs.jmhAnnotationProcessor
}

jmh {
Expand Down
119 changes: 0 additions & 119 deletions benchmarks/benchmarks-core/gradle.lockfile

This file was deleted.

50 changes: 14 additions & 36 deletions build.gradle
@@ -1,29 +1,26 @@
buildscript {
ext.javaLanguageVersion = JavaLanguageVersion.of(JavaVersion.current().isJava11Compatible() ? JavaVersion.current().getMajorVersion() : 17)
ext.javaTargetVersion = JavaVersion.VERSION_1_8
dependencyLocking {
lockAllConfigurations()
}

repositories {
mavenCentral()
gradlePluginPortal()
}

dependencies {
classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
classpath 'com.netflix.nebula:nebula-release-plugin:17.1.0'
classpath 'com.netflix.nebula:nebula-publishing-plugin:20.1.0'
classpath 'com.netflix.nebula:nebula-project-plugin:10.1.2'
classpath 'io.spring.nohttp:nohttp-gradle:0.0.11'
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
classpath 'de.undercouch:gradle-download-task:5.2.1'
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.19.0'
classpath libs.plugin.license
classpath libs.plugin.nebulaRelease
classpath libs.plugin.nebulaPublishing
classpath libs.plugin.nebulaProject
classpath libs.plugin.noHttp
classpath libs.plugin.nexusPublish
classpath libs.plugin.javaformat
classpath libs.plugin.japicmp
classpath libs.plugin.downloadTask
classpath libs.plugin.spotless

constraints {
classpath('org.ow2.asm:asm:7.3.1') {
classpath(libs.asmForPlugins) {
because 'Supports modern JDKs'
}
}
Expand Down Expand Up @@ -82,8 +79,8 @@ subprojects {
// have to add the dependency in every project, which is tedious so just do it here.
dependencies {
// JSR-305 only used for non-required meta-annotations
optionalApi "com.google.code.findbugs:jsr305:latest.release"
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:latest.release")
optionalApi libs.jsr305
checkstyle libs.spring.javaformatCheckstyle
}

tasks {
Expand Down Expand Up @@ -262,21 +259,6 @@ subprojects {
}
}

dependencyLocking {
lockAllConfigurations()
}

tasks.register('resolveAndLockAll') {
description = 'Resolves dependencies of all configurations and writes them into the lock file.'
outputs.upToDateWhen { false }
doFirst {
assert gradle.startParameter.writeDependencyLocks || gradle.startParameter.lockedDependenciesToUpdate: 'Execute resolveAndLockAll --write-locks or --update-locks <dependencies>'
}
doLast {
project.configurations.findAll { it.canBeResolved }*.resolve()
}
}

tasks.register('downloadDependencies') {
outputs.upToDateWhen { false }
doLast {
Expand Down Expand Up @@ -390,7 +372,7 @@ subprojects {
description = 'Application monitoring instrumentation facade'

repositories {
maven {
maven {
url 'https://repo.spring.io/snapshot/'
content { includeGroup 'io.micrometer' }
}
Expand All @@ -412,10 +394,6 @@ nexusPublishing {
}
}

task deleteLockFiles(type: Delete) {
delete fileTree(dir: '.', include: '**/gradle.lockfile')
}

wrapper {
gradleVersion = '8.3'
}
Expand Down
106 changes: 0 additions & 106 deletions buildscript-gradle.lockfile

This file was deleted.

0 comments on commit 94a17e0

Please sign in to comment.