Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cloudbank-v4/account/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2023, 2024, Oracle and/or its affiliates. -->
<!-- Copyright (c) 2023, 2025, Oracle and/or its affiliates. -->
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
Expand Down Expand Up @@ -43,12 +43,7 @@
<artifactId>microtx-lra-spring-boot-starter</artifactId>
<version>${oracle-microtx-starter.version}</version>
</dependency>
<dependency>
<groupId>net.ttddyy.observation</groupId>
<artifactId>datasource-micrometer-spring-boot</artifactId>
<version>${datasource-micrometer-spring-boot.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>com.example</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
Expand Down
18 changes: 6 additions & 12 deletions cloudbank-v4/account/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
# Copyright (c) 2023, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

spring:
application:
name: account
jpa:
hibernate:
ddl-auto: validate
properties:
hibernate:
dialect: org.hibernate.dialect.OracleDialect
format_sql: true
show-sql: true
microtx:
lra:
coordinator-url: ${MP_LRA_COORDINATOR_URL}
propagation-active: true
headers-propagation-prefix: "{x-b3-, oracle-tmm-, authorization, refresh-}"
cloud:
config:
import-check:
enabled: false
config:
import: classpath:common.yaml


liquibase:
change-log: classpath:db/changelog/controller.yaml
Expand All @@ -28,9 +25,6 @@ spring:
enabled: ${LIQUIBASE_ENABLED:true}

datasource:
url: ${spring.datasource.url}
username: ${spring.datasource.username}
password: ${spring.datasource.password}
driver-class-name: oracle.jdbc.OracleDriver
type: oracle.ucp.jdbc.PoolDataSource
oracleucp:
Expand Down
13 changes: 13 additions & 0 deletions cloudbank-v4/buildtools/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2025, Oracle and/or its affiliates. -->
<!-- Licensed under the Universal Permissive License v 1.0 as shown at
https://oss.oracle.com/licenses/upl/ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>buildtools</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Build Tools</name>
</project>

Large diffs are not rendered by default.

329 changes: 0 additions & 329 deletions cloudbank-v4/chatbot/checkstyle/checkstyle.xml

This file was deleted.

13 changes: 0 additions & 13 deletions cloudbank-v4/chatbot/checkstyle/suppressions.xml

This file was deleted.

3 changes: 0 additions & 3 deletions cloudbank-v4/chatbot/dependency-check/suppressions.xml

This file was deleted.

34 changes: 15 additions & 19 deletions cloudbank-v4/chatbot/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2024, Oracle and/or its affiliates. -->
<!-- Copyright (c) 2024, 2025, Oracle and/or its affiliates. -->
<!-- Licensed under the Universal Permissive License v 1.0 as shown at
https://oss.oracle.com/licenses/upl/ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
Expand All @@ -19,15 +19,11 @@ https://oss.oracle.com/licenses/upl/ -->
<description>A Simple ChatBot Application</description>

<properties>
<java.version>21</java.version>
<spring-ai.version>1.0.0-M6</spring-ai.version>
</properties>
<java.version>21</java.version>
<spring-ai.version>1.0.0-M6</spring-ai.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
Expand All @@ -39,17 +35,17 @@ https://oss.oracle.com/licenses/upl/ -->
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-bom</artifactId>
<version>${spring-ai.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-bom</artifactId>
<version>${spring-ai.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
Expand Down
7 changes: 7 additions & 0 deletions cloudbank-v4/chatbot/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

spring:
application:
name: chatbot
Expand All @@ -8,5 +11,9 @@ spring:
enabled: true
options:
model: llama3
cloud:
config:
import-check:
enabled: false
config:
import: classpath:common.yaml
Loading