Merge branch 'main' into spec-update/orchestration/main

Author: Jonas-Isr

.github/workflows/fosstars-report.yml

@@ -41,11 +41,16 @@ jobs:
           MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} clean install -DskipTests -DskipFormatting"
           mvn $MVN_ARGS
 
+      - name: "Create settings.xml"
+        run: |
+          echo '${{ secrets.OSS_INDEX_SETTINGS_XML }}' > settings.xml
+
       - name: "CVE Scan"
         env:
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
-        run: |
-          mvn -T1 --no-transfer-progress --batch-mode org.owasp:dependency-check-maven:check org.owasp:dependency-check-maven:aggregate
+        run: >
+          mvn -T1 --no-transfer-progress -s settings.xml
+          --batch-mode org.owasp:dependency-check-maven:check org.owasp:dependency-check-maven:aggregate
 
       - name: "Archive CVE Report"
         uses: actions/upload-artifact@v4

pom.xml

@@ -780,6 +780,7 @@ https://gitbox.apache.org/repos/asf?p=maven-pmd-plugin.git;a=blob_plain;f=src/ma
           <suppressionFile>${project.rootdir}/.pipeline/dependency-check-suppression.xml</suppressionFile>
           <nvdValidForHours>46</nvdValidForHours>
           <skipProvidedScope>true</skipProvidedScope>
+          <ossIndexServerId>ossindex</ossIndexServerId>
         </configuration>
       </plugin>
     </plugins>

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java

@@ -10,8 +10,6 @@
 import com.sap.ai.sdk.orchestration.DpiMasking;
 import com.sap.ai.sdk.orchestration.OrchestrationClientException;
 import com.sap.ai.sdk.orchestration.OrchestrationModuleConfig;
-import com.sap.ai.sdk.orchestration.ResponseJsonSchema;
-import com.sap.ai.sdk.orchestration.TemplateConfig;
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
 import com.sap.ai.sdk.orchestration.spring.OrchestrationChatModel;
 import com.sap.ai.sdk.orchestration.spring.OrchestrationChatOptions;
@@ -261,13 +259,9 @@ public record Translation(
   public Translation responseFormat() {
     val cl = ChatClient.builder(new OrchestrationChatModel()).build();
 
-    val schema = ResponseJsonSchema.fromType(Translation.class);
-    val template = TemplateConfig.create().withJsonSchemaResponse(schema);
-
-    val options = new OrchestrationChatOptions(config.withTemplateConfig(template));
     val prompt =
-        new Prompt("How do I say 'AI is going to revolutionize the world' in dutch?", options);
-
+        new Prompt(
+            "How do I say 'AI is going to revolutionize the world' in dutch?", defaultOptions);
     return cl.prompt(prompt).call().entity(Translation.class);
   }
 }