Merge branch 'v1.x.x' into apiml/release/1_28_24

zowe · Oct 3, 2023 · 9507675 · 9507675
2 parents de2c06d + 0dc52ce
commit 9507675
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/api-catalog-services/src/main/resources/application.yml b/api-catalog-services/src/main/resources/application.yml
@@ -33,7 +33,7 @@ logging:
         com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient: OFF
         com.netflix.discovery.DiscoveryClient: OFF
         org.springframework.boot.web.embedded.tomcat.TomcatWebServer: INFO
-        net.sf.ehcache: WARN
+        org.ehcache: WARN
 
         # New Config
         org.apache: WARN #org.apache.catalina, org.apache.coyote, org.apache.tomcat
@@ -194,7 +194,7 @@ logging:
         org.apache: INFO
         org.apache.http: DEBUG
         com.netflix: INFO
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
 
 ---
 spring:

diff --git a/api-catalog-services/src/test/resources/application.yml b/api-catalog-services/src/test/resources/application.yml
@@ -30,7 +30,7 @@ logging:
         com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient: OFF
         com.netflix.discovery.DiscoveryClient: OFF
         org.springframework.boot.web.embedded.tomcat.TomcatWebServer: INFO
-        net.sf.ehcache: WARN
+        org.ehcache: WARN
 
         # New Config
         org.apache: WARN #org.apache.catalina, org.apache.coyote, org.apache.tomcat
@@ -189,7 +189,7 @@ logging:
         org.apache: INFO
         org.apache.http: DEBUG
         com.netflix: INFO
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
 
 ---
 spring:

diff --git a/caching-service/src/main/resources/application.yml b/caching-service/src/main/resources/application.yml
@@ -165,7 +165,7 @@ logging:
         com.netflix: INFO
         org.hibernate: INFO
         org.springframework.web.servlet.PageNotFound: WARN
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
         org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilter: INFO
 
 ---

diff --git a/discovery-service/src/main/resources/application.yml b/discovery-service/src/main/resources/application.yml
@@ -11,7 +11,7 @@ logging:
         com.netflix.discovery.DiscoveryClient: OFF
         org.springframework.boot.web.embedded.tomcat.TomcatWebServer: INFO
         com.sun.jersey.server.impl.application.WebApplicationImpl: WARN
-        net.sf.ehcache: WARN
+        org.ehcache: WARN
 
         # New Config
         org.apache: WARN #org.apache.catalina, org.apache.coyote, org.apache.tomcat
@@ -159,7 +159,7 @@ logging:
         org.apache.http: DEBUG
         com.netflix: INFO
         com.sun.jersey.server.impl.application.WebApplicationImpl: INFO
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
 
 ---
 spring:

diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ logging:
         org.zowe.apiml.gateway.error: INFO
         org.eclipse.jetty: WARN
         org.springframework.web.servlet.PageNotFound: ERROR
-        net.sf.ehcache: WARN
+        org.ehcache: WARN
         org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilter: ERROR
         # New Config
         org.apache: WARN  #org.apache.catalina, org.apache.coyote, org.apache.tomcat
@@ -268,7 +268,7 @@ logging:
         com.netflix: INFO
         org.hibernate: INFO
         org.springframework.web.servlet.PageNotFound: WARN
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
         org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilter: INFO
 
 ---

diff --git a/gateway-service/src/test/resources/application-test.yml b/gateway-service/src/test/resources/application-test.yml
@@ -228,7 +228,7 @@ logging:
         com.netflix: INFO
         org.hibernate: INFO
         org.springframework.web.servlet.PageNotFound: WARN
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
         org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilter: INFO
 
 ---

diff --git a/gateway-service/src/test/resources/application.yml b/gateway-service/src/test/resources/application.yml
@@ -236,7 +236,7 @@ logging:
         com.netflix: INFO
         org.hibernate: INFO
         org.springframework.web.servlet.PageNotFound: WARN
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
         org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilter: INFO
 
 ---

diff --git a/metrics-service/src/main/resources/application.yml b/metrics-service/src/main/resources/application.yml
@@ -151,7 +151,7 @@ logging:
         com.netflix: INFO
         org.hibernate: INFO
         org.springframework.web.servlet.PageNotFound: WARN
-        net.sf.ehcache: INFO
+        org.ehcache: INFO
         org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilter: INFO
 
 ---