Skip to content

Commit 96d6f95

Browse files
Merge pull request #1055 from oracle/signoz-changes
Signoz changes
2 parents ef2ff42 + cc6f8c5 commit 96d6f95

File tree

54 files changed

+370
-3707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+370
-3707
lines changed

cloudbank-v4/account/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Copyright (c) 2023, 2024, Oracle and/or its affiliates. -->
2+
<!-- Copyright (c) 2023, 2025, Oracle and/or its affiliates. -->
33
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ -->
44
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -43,12 +43,7 @@
4343
<artifactId>microtx-lra-spring-boot-starter</artifactId>
4444
<version>${oracle-microtx-starter.version}</version>
4545
</dependency>
46-
<dependency>
47-
<groupId>net.ttddyy.observation</groupId>
48-
<artifactId>datasource-micrometer-spring-boot</artifactId>
49-
<version>${datasource-micrometer-spring-boot.version}</version>
50-
</dependency>
51-
<dependency>
46+
<dependency>
5247
<groupId>com.example</groupId>
5348
<artifactId>common</artifactId>
5449
<version>${project.version}</version>

cloudbank-v4/account/src/main/resources/application.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring:
55
application:
66
name: account
7-
jpa:
8-
hibernate:
9-
ddl-auto: validate
10-
properties:
11-
hibernate:
12-
dialect: org.hibernate.dialect.OracleDialect
13-
format_sql: true
14-
show-sql: true
157
microtx:
168
lra:
179
coordinator-url: ${MP_LRA_COORDINATOR_URL}
1810
propagation-active: true
1911
headers-propagation-prefix: "{x-b3-, oracle-tmm-, authorization, refresh-}"
12+
cloud:
13+
config:
14+
import-check:
15+
enabled: false
2016
config:
2117
import: classpath:common.yaml
18+
2219

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

3027
datasource:
31-
url: ${spring.datasource.url}
32-
username: ${spring.datasource.username}
33-
password: ${spring.datasource.password}
3428
driver-class-name: oracle.jdbc.OracleDriver
3529
type: oracle.ucp.jdbc.PoolDataSource
3630
oracleucp:

cloudbank-v4/buildtools/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Copyright (c) 2025, Oracle and/or its affiliates. -->
3+
<!-- Licensed under the Universal Permissive License v 1.0 as shown at
4+
https://oss.oracle.com/licenses/upl/ -->
5+
<project xmlns="http://maven.apache.org/POM/4.0.0"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
8+
<modelVersion>4.0.0</modelVersion>
9+
<groupId>com.example</groupId>
10+
<artifactId>buildtools</artifactId>
11+
<version>0.0.1-SNAPSHOT</version>
12+
<name>Build Tools</name>
13+
</project>

cloudbank-v4/account/checkstyle/checkstyle.xml renamed to cloudbank-v4/buildtools/src/main/resources/cloudbank/checkstyle/checkstyle.xml

Lines changed: 155 additions & 153 deletions
Large diffs are not rendered by default.

cloudbank-v4/chatbot/checkstyle/checkstyle.xml

Lines changed: 0 additions & 329 deletions
This file was deleted.

cloudbank-v4/chatbot/checkstyle/suppressions.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

cloudbank-v4/chatbot/dependency-check/suppressions.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

cloudbank-v4/chatbot/pom.xml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Copyright (c) 2024, Oracle and/or its affiliates. -->
2+
<!-- Copyright (c) 2024, 2025, Oracle and/or its affiliates. -->
33
<!-- Licensed under the Universal Permissive License v 1.0 as shown at
44
https://oss.oracle.com/licenses/upl/ -->
55
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,15 +19,11 @@ https://oss.oracle.com/licenses/upl/ -->
1919
<description>A Simple ChatBot Application</description>
2020

2121
<properties>
22-
<java.version>21</java.version>
23-
<spring-ai.version>1.0.0-M6</spring-ai.version>
24-
</properties>
22+
<java.version>21</java.version>
23+
<spring-ai.version>1.0.0-M6</spring-ai.version>
24+
</properties>
2525

2626
<dependencies>
27-
<dependency>
28-
<groupId>org.springframework.ai</groupId>
29-
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
30-
</dependency>
3127
<dependency>
3228
<groupId>org.springframework.ai</groupId>
3329
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
@@ -39,17 +35,17 @@ https://oss.oracle.com/licenses/upl/ -->
3935
</dependency>
4036
</dependencies>
4137

42-
<dependencyManagement>
43-
<dependencies>
44-
<dependency>
45-
<groupId>org.springframework.ai</groupId>
46-
<artifactId>spring-ai-bom</artifactId>
47-
<version>${spring-ai.version}</version>
48-
<type>pom</type>
49-
<scope>import</scope>
50-
</dependency>
51-
</dependencies>
52-
</dependencyManagement>
38+
<dependencyManagement>
39+
<dependencies>
40+
<dependency>
41+
<groupId>org.springframework.ai</groupId>
42+
<artifactId>spring-ai-bom</artifactId>
43+
<version>${spring-ai.version}</version>
44+
<type>pom</type>
45+
<scope>import</scope>
46+
</dependency>
47+
</dependencies>
48+
</dependencyManagement>
5349
<build>
5450
<plugins>
5551
<plugin>

0 commit comments

Comments
 (0)