Merge pull request #663 from salesforce/timbermill-p0-1

@W-14228234 Spring p0
salesforce · Nov 13, 2023 · fdc29c7 · fdc29c7
2 parents 41a31bd + 2961cda
commit fdc29c7
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 7 deletions.
diff --git a/timbermill-java/timbermill-api/pom.xml b/timbermill-java/timbermill-api/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.3</timbermill.version>
+        <timbermill.version>2.5.4</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
     </properties>
 

diff --git a/timbermill-java/timbermill-client/pom.xml b/timbermill-java/timbermill-client/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.3</timbermill.version>
+        <timbermill.version>2.5.4</timbermill.version>
         <aspectj.version>1.9.7</aspectj.version>
         <org.springframework.version>5.3.20</org.springframework.version>
     </properties>

diff --git a/timbermill-java/timbermill-local/pom.xml b/timbermill-java/timbermill-local/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.3</timbermill.version>
+        <timbermill.version>2.5.4</timbermill.version>
         <kamon.bundle.version>2.5.12</kamon.bundle.version>
     </properties>
 

diff --git a/timbermill-java/timbermill-server/pom.xml b/timbermill-java/timbermill-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.3.RELEASE</version>
+        <version>2.7.17</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,11 +17,39 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.3</timbermill.version>
+        <timbermill.version>2.5.4</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
         <logbackVersion>0.1.5</logbackVersion>
+        <spring-cloud.version>2021.0.8</spring-cloud.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-client</artifactId>
+                <version>7.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                <version>7.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch</groupId>
+                <artifactId>elasticsearch</artifactId>
+                <version>7.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -38,6 +66,17 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -46,7 +85,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
-            <version>2.2.1.RELEASE</version>
+            <version>3.1.8</version>
         </dependency>
         <dependency>
             <groupId>com.datorama.oss</groupId>

diff --git a/timbermill-java/timbermill-server/src/main/resources/application.properties b/timbermill-java/timbermill-server/src/main/resources/application.properties
@@ -2,7 +2,7 @@ spring.application.name=timbermill2
 server.port=8484
 spring.cloud.config.enabled=true
 spring.cloud.config.token=${SPRING_CLOUD_CONFIG_TOKEN}
-spring.cloud.config.uri=${SPRING_CLOUD_CONFIG_URI}
+spring.config.import=configserver:${SPRING_CLOUD_CONFIG_URI}
 
 health.config.enabled=false
 management.health.elasticsearch.enabled=false