Skip to content

Commit e0e989f

Browse files
authored
Shade Jackson (#689)
* Shade Jackson * Fixes
1 parent 44edbaf commit e0e989f

File tree

17 files changed

+53
-17
lines changed

17 files changed

+53
-17
lines changed

aws/client/aws-client-awsjson/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extra["moduleName"] = "software.amazon.smithy.java.aws.client.awsjson"
1010

1111
dependencies {
1212
api(project(":client:client-http"))
13-
api(project(":codecs:json-codec"))
13+
api(project(":codecs:json-codec", configuration = "shadow"))
1414
api(project(":aws:aws-event-streams"))
1515
api(libs.smithy.aws.traits)
1616

aws/client/aws-client-restjson/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extra["moduleName"] = "software.amazon.smithy.java.aws.client.restjson"
1111
dependencies {
1212
api(project(":client:client-http-binding"))
1313
api(project(":client:client-http"))
14-
api(project(":codecs:json-codec"))
14+
api(project(":codecs:json-codec", configuration = "shadow"))
1515
api(project(":aws:aws-event-streams"))
1616
api(libs.smithy.aws.traits)
1717

aws/sdkv2/aws-sdkv2-shapes/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extra["displayName"] = "Smithy :: Java :: AWS :: SDKv2 :: Shapes"
88
extra["moduleName"] = "software.amazon.smithy.java.aws.sdkv2.shapes"
99

1010
dependencies {
11-
implementation(project(":codecs:json-codec"))
11+
implementation(project(":codecs:json-codec", configuration = "shadow"))
1212
implementation(project(":core"))
1313
implementation(project(":aws:client:aws-client-restjson"))
1414
implementation(project(":aws:client:aws-client-awsjson"))

aws/server/aws-server-restjson/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
implementation(project(":server:server-core"))
1616
implementation(project(":context"))
1717
implementation(project(":core"))
18-
implementation(project(":codecs:json-codec"))
18+
implementation(project(":codecs:json-codec", configuration = "shadow"))
1919
implementation(project(":http:http-binding"))
2020

2121
itImplementation(project(":server:server-api"))

buildSrc/src/main/kotlin/smithy-java.publishing-conventions.gradle.kts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ plugins {
77
signing
88
}
99

10+
interface PublishingConfigExtension {
11+
var customComponent: SoftwareComponent?
12+
}
13+
14+
val extension = project.extensions.create<PublishingConfigExtension>("configurePublishing").apply {
15+
customComponent = null
16+
}
17+
1018
/*
1119
* Staging repository
1220
* ====================================================
@@ -24,8 +32,7 @@ publishing {
2432
publications {
2533
afterEvaluate {
2634
create<MavenPublication>("mavenJava") {
27-
from(components["java"])
28-
35+
from(extension.customComponent ?: components["java"])
2936
val displayName: String by extra
3037
pom {
3138
name.set(displayName)

cli/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
implementation(project(":client:client-rpcv2-cbor"))
1919

2020
implementation(project(":client:dynamic-client"))
21-
implementation(project(":codecs:json-codec"))
21+
implementation(project(":codecs:json-codec", configuration = "shadow"))
2222
implementation(project(":client:client-http"))
2323
implementation(project(":aws:client:aws-client-core"))
2424
implementation(project(":aws:aws-sigv4"))

client/client-http-binding/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies {
1313
api(project(":http:http-binding"))
1414
implementation(project(":logging"))
1515

16-
testImplementation(project(":codecs:json-codec"))
16+
testImplementation(project(":codecs:json-codec", configuration = "shadow"))
1717
}

client/client-http/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
api(project(":http:http-api"))
1313
implementation(project(":logging"))
1414

15-
testImplementation(project(":codecs:json-codec"))
15+
testImplementation(project(":codecs:json-codec", configuration = "shadow"))
1616
testImplementation(project(":aws:client:aws-client-awsjson"))
1717
testImplementation(project(":client:dynamic-client"))
1818
}

codecs/cbor-codec/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ extra["moduleName"] = "software.amazon.smithy.java.cbor"
1111
dependencies {
1212
api(project(":core"))
1313
testFixturesImplementation(libs.assertj.core)
14-
testImplementation(project(":codecs:json-codec"))
14+
testImplementation(project(":codecs:json-codec", configuration = "shadow"))
1515
}

codecs/json-codec/build.gradle.kts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id("smithy-java.module-conventions")
3+
alias(libs.plugins.shadow)
34
}
45

56
description = "This module provides json functionality"
@@ -11,3 +12,31 @@ dependencies {
1112
api(project(":core"))
1213
implementation(libs.jackson.core)
1314
}
15+
16+
tasks {
17+
shadowJar {
18+
archiveClassifier.set("")
19+
mergeServiceFiles()
20+
21+
dependencies {
22+
include(
23+
dependency(
24+
libs.jackson.core
25+
.get()
26+
.toString(),
27+
),
28+
)
29+
relocate("com.fasterxml.jackson.core", "software.amazon.smithy.java.internal.shaded.com.fasterxml.jackson.core")
30+
}
31+
}
32+
jar {
33+
finalizedBy(shadowJar)
34+
}
35+
}
36+
37+
(components["shadow"] as AdhocComponentWithVariants).addVariantsFromConfiguration(configurations.apiElements.get()) {
38+
}
39+
40+
configurePublishing {
41+
customComponent = components["shadow"] as SoftwareComponent
42+
}

codegen/codegen-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extra["moduleName"] = "software.amazon.smithy.java.codegen.core"
1010

1111
dependencies {
1212
api(libs.smithy.codegen)
13-
itImplementation(project(":codecs:json-codec"))
13+
itImplementation(project(":codecs:json-codec", configuration = "shadow"))
1414
}
1515

1616
addGenerateSrcsTask("software.amazon.smithy.java.codegen.utils.TestJavaCodegenRunner")

dynamic-schemas/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ extra["moduleName"] = "software.amazon.smithy.java.dynamicschemas"
1010
dependencies {
1111
api(project(":core"))
1212

13-
testImplementation(project(":codecs:json-codec"))
13+
testImplementation(project(":codecs:json-codec", configuration = "shadow"))
1414
}

mcp/mcp-bundle-api/src/main/resources/META-INF/smithy/mcpbundle.smithy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ structure CodeRepoBundle with [CommonBundleConfig] {
3131
/// The URL of this MCP server's code repository
3232
@required
3333
codeRepoUrl: String
34-
}
34+
}

mcp/mcp-cli-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(libs.smithy.model)
1414
api(libs.picocli)
1515
api(project(":mcp:mcp-bundle-api"))
16-
implementation(project(":codecs:json-codec"))
16+
implementation(project(":codecs:json-codec", configuration = "shadow"))
1717
implementation(project(":logging"))
1818
smithyBuild(project(":codegen:plugins:types-codegen"))
1919
}

mcp/mcp-cli/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
implementation(project(":logging"))
1818
implementation(project(":mcp:mcp-server"))
1919
implementation(project(":server:server-proxy"))
20-
implementation(project(":codecs:json-codec"))
20+
implementation(project(":codecs:json-codec", configuration = "shadow"))
2121
implementation(libs.picocli)
2222
api(project(":mcp:mcp-cli-api"))
2323
implementation(libs.smithy.utils)

mcp/mcp-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
implementation(project(":server:server-core"))
1414
implementation(project(":logging"))
1515
implementation(project(":context"))
16-
implementation(project(":codecs:json-codec"))
16+
implementation(project(":codecs:json-codec", configuration = "shadow"))
1717
implementation(project(":mcp:mcp-schemas"))
1818
implementation(project(":mcp:mcp-bundle-api"))
1919
}

protocol-test-harness/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
implementation(project(":server:server-api"))
2121
implementation(project(":server:server-core"))
2222
implementation(project(":client:client-http"))
23-
implementation(project(":codecs:json-codec"))
23+
implementation(project(":codecs:json-codec", configuration = "shadow"))
2424
implementation(libs.assertj.core)
2525

2626
api(platform(libs.junit.bom))

0 commit comments

Comments
 (0)