Skip to content

Commit c057148

Browse files
committed
chore: Update dependencies and fix OpenAPI client generation
- Upgrade Spring Boot to 3.3.6 - Update swagger-codegen-maven-plugin to 3.0.64 - Add custom template for HttpBasicAuth - Fix mockwebserver version to 4.12.0 - Fix parent version reference in opensearch-store
1 parent 7feb13b commit c057148

File tree

5 files changed

+44
-3
lines changed

5 files changed

+44
-3
lines changed

models/spring-ai-huggingface/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>io.swagger.codegen.v3</groupId>
9292
<artifactId>swagger-codegen-maven-plugin</artifactId>
93-
<version>3.0.46</version>
93+
<version>3.0.64</version>
9494
<executions>
9595
<execution>
9696
<goals>
@@ -100,6 +100,7 @@
100100
<inputSpec>${project.basedir}/src/main/resources/openapi.json</inputSpec>
101101
<language>java</language>
102102
<library>resttemplate</library>
103+
<templateDirectory>src/main/resources/handlebars/Java</templateDirectory>
103104
<apiPackage>org.springframework.ai.huggingface.api</apiPackage>
104105
<modelPackage>org.springframework.ai.huggingface.model</modelPackage>
105106
<invokerPackage>org.springframework.ai.huggingface.invoker</invokerPackage>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package {{invokerPackage}}.auth;
2+
3+
import java.io.UnsupportedEncodingException;
4+
import java.nio.charset.StandardCharsets;
5+
6+
import org.springframework.http.HttpHeaders;
7+
import org.springframework.util.MultiValueMap;
8+
9+
{{>generatedAnnotation}}
10+
public class HttpBasicAuth implements Authentication {
11+
private String username;
12+
private String password;
13+
14+
public String getUsername() {
15+
return username;
16+
}
17+
18+
public void setUsername(String username) {
19+
this.username = username;
20+
}
21+
22+
public String getPassword() {
23+
return password;
24+
}
25+
26+
public void setPassword(String password) {
27+
this.password = password;
28+
}
29+
30+
@Override
31+
public void applyToParams(MultiValueMap<String, String> queryParams, HttpHeaders headerParams) {
32+
if (username == null && password == null) {
33+
return;
34+
}
35+
String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
36+
headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + java.util.Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));
37+
}
38+
}

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<maven.compiler.target>17</maven.compiler.target>
170170

171171
<!-- production dependencies -->
172-
<spring-boot.version>3.3.4</spring-boot.version>
172+
<spring-boot.version>3.3.6</spring-boot.version>
173173
<ST4.version>4.3.4</ST4.version>
174174
<azure-open-ai-client.version>1.0.0-beta.12</azure-open-ai-client.version>
175175
<jtokkit.version>1.1.0</jtokkit.version>
@@ -233,6 +233,7 @@
233233

234234
<!-- testing dependencies -->
235235
<testcontainers.opensearch.version>2.0.1</testcontainers.opensearch.version>
236+
<okhttp3.version>4.12.0</okhttp3.version>
236237

237238
<!-- documentation dependencies -->
238239
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>

spring-ai-test/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<dependency>
7171
<groupId>com.squareup.okhttp3</groupId>
7272
<artifactId>mockwebserver</artifactId>
73+
<version>${okhttp3.version}</version>
7374
</dependency>
7475
</dependencies>
7576
</project>

vector-stores/spring-ai-opensearch-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>org.springframework.ai</groupId>
7373
<artifactId>spring-ai-ollama</artifactId>
74-
<version>${parent.version}</version>
74+
<version>${project.parent.version}</version>
7575
<scope>test</scope>
7676
</dependency>
7777

0 commit comments

Comments
 (0)