Merge pull request #403 from RWS/subtask/UDP-11072

UDP-11072 remove TomcatConfiguration
RWS · Aug 5, 2024 · e655203 · e655203
2 parents a72e93f + c03ff44
commit e655203
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 90 deletions.
diff --git a/odata_webservice/src/main/java/com/sdl/odata/webservice/TomcatConfiguration.java b/odata_webservice/src/main/java/com/sdl/odata/webservice/TomcatConfiguration.java
diff --git a/odata_webservice/src/main/resources/application.yml b/odata_webservice/src/main/resources/application.yml
@@ -14,10 +14,11 @@
 # limitations under the License.
 #
 
-https:
-    enabled: false
+server:
     port: 8084
-    keystore-path: config/keystore
-    key-alias: tomcat
-    keystore-passwd:  changeit
-    truststore-passwd: changeit
+    ssl:
+        enabled: false
+        key-alias: tomcat
+        key-store: config/keystore
+        key-store-password: changeit
+        trust-store-password: changeit