Skip to content

Commit 4b7c60f

Browse files
authored
Fix Square runtime packaging and submodule tracking (#233)
1 parent 21e9459 commit 4b7c60f

5 files changed

Lines changed: 34 additions & 2 deletions

File tree

.gitmodules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[submodule "ChimeSMALibrary"]
22
path = ChimeSMALibrary
33
url = https://github.com/docwho2/java-chime-voicesdk-sma.git
4+
branch = main
45
[submodule "ChimeCDKProvision"]
56
path = ChimeCDKProvision
67
url = https://github.com/docwho2/java-chime-voice-sdk-cdk.git
8+
branch = main

ChimeCDKProvision

ChimeSMA/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@
3232
<groupId>com.squareup</groupId>
3333
<artifactId>square</artifactId>
3434
</dependency>
35+
<dependency>
36+
<!-- Keep SnapStart Lambda packaging on the JVM OkHttp artifact after the Square SDK bump. -->
37+
<groupId>com.squareup.okhttp3</groupId>
38+
<artifactId>okhttp-jvm</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.squareup.okio</groupId>
42+
<artifactId>okio-jvm</artifactId>
43+
</dependency>
3544

3645
</dependencies>
3746

SpringAI/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,15 @@
164164
<groupId>com.squareup</groupId>
165165
<artifactId>square</artifactId>
166166
</dependency>
167+
<dependency>
168+
<!-- Square 46 pulls a metadata-only okhttp artifact in Maven/SAM builds; force the JVM jar. -->
169+
<groupId>com.squareup.okhttp3</groupId>
170+
<artifactId>okhttp-jvm</artifactId>
171+
</dependency>
172+
<dependency>
173+
<groupId>com.squareup.okio</groupId>
174+
<artifactId>okio-jvm</artifactId>
175+
</dependency>
167176

168177

169178
<!-- JUnit / Spring Boot test support -->

pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@
2929
<maven.compiler.release>25</maven.compiler.release>
3030
<lombok.version>1.18.44</lombok.version>
3131
<pdfbox.version>3.0.7</pdfbox.version>
32+
<okhttp.jvm.version>5.2.1</okhttp.jvm.version>
33+
<okio.jvm.version>3.16.1</okio.jvm.version>
3234
<!-- The below three all need to be aligned -->
3335
<spring.boot.version>4.0.5</spring.boot.version>
34-
<spring.cloud.version>5.0.0</spring.cloud.version>
36+
<spring.cloud.version>5.0.1</spring.cloud.version>
3537
<spring.ai.version>2.0.0-M4</spring.ai.version>
3638
</properties>
3739

@@ -114,6 +116,16 @@
114116
<artifactId>square</artifactId>
115117
<version>46.1.0.20260122</version>
116118
</dependency>
119+
<dependency>
120+
<groupId>com.squareup.okhttp3</groupId>
121+
<artifactId>okhttp-jvm</artifactId>
122+
<version>${okhttp.jvm.version}</version>
123+
</dependency>
124+
<dependency>
125+
<groupId>com.squareup.okio</groupId>
126+
<artifactId>okio-jvm</artifactId>
127+
<version>${okio.jvm.version}</version>
128+
</dependency>
117129

118130
<!-- used for web crawling sites -->
119131
<dependency>

0 commit comments

Comments
 (0)