Merge branch 'master' of gitlab.exist.com:pemc/config

crss-dataflow-app/application-devlocal.yml

@@ -5,17 +5,18 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
       connectionTimeout: 10000
+      maxPoolSize: 20
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: update
+        ddl-auto: none
         hbm2ddl:
           import_files:
 
@@ -24,6 +25,10 @@ spring:
     job:
       enabled: false
 
+  redis:
+      host: localhost
+      port: 6379
+
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
 
@@ -38,18 +43,18 @@ server:
     enabled: true
     min-response-size: 1
 
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://localhost:8082/user
 
 logging:
   level:
@@ -57,6 +62,7 @@ logging:
     com.netflix: DEBUG
     org.springframework.cloud: DEBUG
     org.apache.http: DEBUG
+    org.hibernate.stat: debug
 
 dataflow:
   url: http://localhost:9393
@@ -73,4 +79,4 @@ sftp:
 # temporary todi-config, to be moved to general config
 todi-config:
   dispatch-interval: 5
-  max-retry: 2
+  max-retry: 2