Skip to content

Commit 6a4e7c7

Browse files
Merge pull request #1931 from aws/main-into-v1.7-main-merge
misc: merge main into v1.7-main
2 parents ac50ef5 + 593a47f commit 6a4e7c7

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

aws-runtime/aws-config/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,16 @@ smithyBuild {
213213
}
214214
}
215215

216+
// FIXME `IntrospectOAuth2TokenWithIAM` is not needed for any credentials provider and is only added because
217+
// of https://github.com/smithy-lang/smithy/issues/3190
216218
transforms = listOf(
217219
"""
218220
{
219221
"name": "awsSmithyKotlinIncludeOperations",
220222
"args": {
221223
"operations": [
222-
"com.amazonaws.signin#CreateOAuth2Token"
224+
"com.amazonaws.signin#CreateOAuth2Token",
225+
"com.amazonaws.signin#IntrospectOAuth2TokenWithIAM"
223226
]
224227
}
225228
}

settings.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ pluginManagement {
2828

2929
dependencyResolutionManagement {
3030
repositories {
31-
mavenLocal()
31+
mavenLocal {
32+
content {
33+
excludeGroupByRegex("""org\.jetbrains\.kotlin.*""")
34+
excludeGroupByRegex("""org\.jetbrains\.kotlinx.*""")
35+
excludeGroup("org.jetbrains")
36+
}
37+
}
3238
mavenCentral()
3339
maven {
3440
name = "kotlinRepoTools"

0 commit comments

Comments
 (0)