From 79b80c7e8d8e4bac89eff8286f178d3c74f3f774 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Thu, 6 Oct 2022 22:53:45 -0600 Subject: [PATCH] Use Micrometer SNAPSHOTs --- reactive/rsocket/hello-security/build.gradle | 3 --- reactive/webflux-fn/hello-security/build.gradle | 2 ++ reactive/webflux-fn/hello/build.gradle | 2 ++ .../java/authentication/username-password/form/build.gradle | 2 ++ reactive/webflux/java/authentication/x509/build.gradle | 2 ++ reactive/webflux/java/hello-security-explicit/build.gradle | 2 ++ reactive/webflux/java/hello-security/build.gradle | 2 ++ reactive/webflux/java/hello/build.gradle | 2 ++ reactive/webflux/java/method/build.gradle | 2 ++ reactive/webflux/java/oauth2/login/build.gradle | 2 ++ reactive/webflux/java/oauth2/resource-server/build.gradle | 2 ++ reactive/webflux/java/oauth2/webclient/build.gradle | 2 ++ reactive/webflux/kotlin/hello-security/build.gradle.kts | 2 ++ servlet/java-configuration/authentication/preauth/build.gradle | 2 ++ .../java-configuration/authentication/remember-me/build.gradle | 2 ++ servlet/spring-boot/java/hello-security-explicit/build.gradle | 2 ++ servlet/spring-boot/java/hello-security/build.gradle | 2 ++ servlet/spring-boot/java/hello/build.gradle | 2 ++ servlet/spring-boot/java/jwt/login/build.gradle | 2 ++ servlet/spring-boot/java/ldap/build.gradle | 2 ++ .../spring-boot/java/oauth2/authorization-server/build.gradle | 2 ++ servlet/spring-boot/java/oauth2/login/build.gradle | 2 ++ .../java/oauth2/resource-server/hello-security/build.gradle | 2 ++ .../spring-boot/java/oauth2/resource-server/jwe/build.gradle | 2 ++ .../java/oauth2/resource-server/multi-tenancy/build.gradle | 2 ++ .../java/oauth2/resource-server/opaque/build.gradle | 2 ++ .../java/oauth2/resource-server/static/build.gradle | 2 ++ servlet/spring-boot/java/oauth2/webclient/build.gradle | 2 ++ .../spring-boot/java/saml2/login-single-tenant/build.gradle | 2 ++ servlet/spring-boot/java/saml2/login/build.gradle | 2 ++ .../spring-boot/java/saml2/refreshable-metadata/build.gradle | 2 ++ servlet/spring-boot/kotlin/hello-security/build.gradle.kts | 2 ++ 32 files changed, 62 insertions(+), 3 deletions(-) diff --git a/reactive/rsocket/hello-security/build.gradle b/reactive/rsocket/hello-security/build.gradle index 5cf144b..768266f 100644 --- a/reactive/rsocket/hello-security/build.gradle +++ b/reactive/rsocket/hello-security/build.gradle @@ -11,9 +11,6 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } -ext["reactor.version"] = "3.5.0-SNAPSHOT" -ext["reactor-netty.version"] = "1.1.0-SNAPSHOT" -ext["spring.version"] = "6.0.0-SNAPSHOT" ext["micrometer.version"] = "1.10.0-SNAPSHOT" dependencies { diff --git a/reactive/webflux-fn/hello-security/build.gradle b/reactive/webflux-fn/hello-security/build.gradle index 672c860..7504f0e 100644 --- a/reactive/webflux-fn/hello-security/build.gradle +++ b/reactive/webflux-fn/hello-security/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/reactive/webflux-fn/hello/build.gradle b/reactive/webflux-fn/hello/build.gradle index 027086c..e91e8af 100644 --- a/reactive/webflux-fn/hello/build.gradle +++ b/reactive/webflux-fn/hello/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/reactive/webflux/java/authentication/username-password/form/build.gradle b/reactive/webflux/java/authentication/username-password/form/build.gradle index 40196ac..2582448 100644 --- a/reactive/webflux/java/authentication/username-password/form/build.gradle +++ b/reactive/webflux/java/authentication/username-password/form/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/reactive/webflux/java/authentication/x509/build.gradle b/reactive/webflux/java/authentication/x509/build.gradle index 9cf166f..8dc23e1 100644 --- a/reactive/webflux/java/authentication/x509/build.gradle +++ b/reactive/webflux/java/authentication/x509/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/reactive/webflux/java/hello-security-explicit/build.gradle b/reactive/webflux/java/hello-security-explicit/build.gradle index 0bf1334..f2e7a97 100644 --- a/reactive/webflux/java/hello-security-explicit/build.gradle +++ b/reactive/webflux/java/hello-security-explicit/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/reactive/webflux/java/hello-security/build.gradle b/reactive/webflux/java/hello-security/build.gradle index 76c27d9..5efa12f 100644 --- a/reactive/webflux/java/hello-security/build.gradle +++ b/reactive/webflux/java/hello-security/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/reactive/webflux/java/hello/build.gradle b/reactive/webflux/java/hello/build.gradle index 027086c..e91e8af 100644 --- a/reactive/webflux/java/hello/build.gradle +++ b/reactive/webflux/java/hello/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/reactive/webflux/java/method/build.gradle b/reactive/webflux/java/method/build.gradle index 69a2ea3..ee09b18 100644 --- a/reactive/webflux/java/method/build.gradle +++ b/reactive/webflux/java/method/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/reactive/webflux/java/oauth2/login/build.gradle b/reactive/webflux/java/oauth2/login/build.gradle index e823595..fda9277 100644 --- a/reactive/webflux/java/oauth2/login/build.gradle +++ b/reactive/webflux/java/oauth2/login/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/reactive/webflux/java/oauth2/resource-server/build.gradle b/reactive/webflux/java/oauth2/resource-server/build.gradle index 22c1990..29ddcea 100644 --- a/reactive/webflux/java/oauth2/resource-server/build.gradle +++ b/reactive/webflux/java/oauth2/resource-server/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/reactive/webflux/java/oauth2/webclient/build.gradle b/reactive/webflux/java/oauth2/webclient/build.gradle index fbe6a06..e172ab0 100644 --- a/reactive/webflux/java/oauth2/webclient/build.gradle +++ b/reactive/webflux/java/oauth2/webclient/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework:spring-webflux' diff --git a/reactive/webflux/kotlin/hello-security/build.gradle.kts b/reactive/webflux/kotlin/hello-security/build.gradle.kts index 4252302..5ae1a47 100644 --- a/reactive/webflux/kotlin/hello-security/build.gradle.kts +++ b/reactive/webflux/kotlin/hello-security/build.gradle.kts @@ -17,6 +17,8 @@ repositories { } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") diff --git a/servlet/java-configuration/authentication/preauth/build.gradle b/servlet/java-configuration/authentication/preauth/build.gradle index 5703fab..df727d0 100644 --- a/servlet/java-configuration/authentication/preauth/build.gradle +++ b/servlet/java-configuration/authentication/preauth/build.gradle @@ -13,6 +13,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation platform("org.springframework:spring-framework-bom:5.3.0") implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") diff --git a/servlet/java-configuration/authentication/remember-me/build.gradle b/servlet/java-configuration/authentication/remember-me/build.gradle index 5703fab..df727d0 100644 --- a/servlet/java-configuration/authentication/remember-me/build.gradle +++ b/servlet/java-configuration/authentication/remember-me/build.gradle @@ -13,6 +13,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation platform("org.springframework:spring-framework-bom:5.3.0") implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") diff --git a/servlet/spring-boot/java/hello-security-explicit/build.gradle b/servlet/spring-boot/java/hello-security-explicit/build.gradle index 0286c7e..d38eea1 100644 --- a/servlet/spring-boot/java/hello-security-explicit/build.gradle +++ b/servlet/spring-boot/java/hello-security-explicit/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/servlet/spring-boot/java/hello-security/build.gradle b/servlet/spring-boot/java/hello-security/build.gradle index a47199d..c2a7aa5 100644 --- a/servlet/spring-boot/java/hello-security/build.gradle +++ b/servlet/spring-boot/java/hello-security/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/servlet/spring-boot/java/hello/build.gradle b/servlet/spring-boot/java/hello/build.gradle index 435ed22..b2ea7d7 100644 --- a/servlet/spring-boot/java/hello/build.gradle +++ b/servlet/spring-boot/java/hello/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/servlet/spring-boot/java/jwt/login/build.gradle b/servlet/spring-boot/java/jwt/login/build.gradle index cbf2c56..eec2e58 100644 --- a/servlet/spring-boot/java/jwt/login/build.gradle +++ b/servlet/spring-boot/java/jwt/login/build.gradle @@ -10,6 +10,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/servlet/spring-boot/java/ldap/build.gradle b/servlet/spring-boot/java/ldap/build.gradle index 8d3c699..9bc6a86 100644 --- a/servlet/spring-boot/java/ldap/build.gradle +++ b/servlet/spring-boot/java/ldap/build.gradle @@ -10,6 +10,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle index 8468f47..5a1c7e0 100644 --- a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle +++ b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.security:spring-security-oauth2-authorization-server:1.0.0-M1' diff --git a/servlet/spring-boot/java/oauth2/login/build.gradle b/servlet/spring-boot/java/oauth2/login/build.gradle index 38e9ce5..ab6d1bb 100644 --- a/servlet/spring-boot/java/oauth2/login/build.gradle +++ b/servlet/spring-boot/java/oauth2/login/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle index 81fb1fa..6fef849 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle @@ -11,6 +11,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle index c55a6f2..7394c95 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle @@ -27,6 +27,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle index 8e69886..967fe5b 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle @@ -27,6 +27,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle index 8e69886..967fe5b 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle @@ -27,6 +27,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle index c55a6f2..7394c95 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle @@ -27,6 +27,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/servlet/spring-boot/java/oauth2/webclient/build.gradle b/servlet/spring-boot/java/oauth2/webclient/build.gradle index 6dd1347..55706a2 100644 --- a/servlet/spring-boot/java/oauth2/webclient/build.gradle +++ b/servlet/spring-boot/java/oauth2/webclient/build.gradle @@ -27,6 +27,8 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework:spring-webflux' diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle index 1297fe6..d550620 100644 --- a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle +++ b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle @@ -12,6 +12,8 @@ repositories { maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { constraints { implementation "org.opensaml:opensaml-core:4.1.1" diff --git a/servlet/spring-boot/java/saml2/login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle index ce1c271..462a45f 100644 --- a/servlet/spring-boot/java/saml2/login/build.gradle +++ b/servlet/spring-boot/java/saml2/login/build.gradle @@ -12,6 +12,8 @@ repositories { maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { constraints { implementation "org.opensaml:opensaml-core:4.2.0" diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle index 1297fe6..d550620 100644 --- a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle +++ b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle @@ -12,6 +12,8 @@ repositories { maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { constraints { implementation "org.opensaml:opensaml-core:4.1.1" diff --git a/servlet/spring-boot/kotlin/hello-security/build.gradle.kts b/servlet/spring-boot/kotlin/hello-security/build.gradle.kts index 008aa15..8226325 100644 --- a/servlet/spring-boot/kotlin/hello-security/build.gradle.kts +++ b/servlet/spring-boot/kotlin/hello-security/build.gradle.kts @@ -17,6 +17,8 @@ repositories { } } +ext["micrometer.version"] = "1.10.0-SNAPSHOT" + dependencies { implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-thymeleaf")