Service starts up!

sam-glendenning · Nov 5, 2021 · 45c7b4e · 45c7b4e
1 parent 4f984ee
commit 45c7b4e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
@@ -33,7 +33,7 @@
   <description>The INDIGO IAM login service</description>
 
   <properties>
-    <eclipselink.version>2.5.2</eclipselink.version>
+    <eclipselink.version>2.7.9</eclipselink.version>
 
     <!-- Sonar Jacoco massaging -->
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/authn/util/SessionTimeoutHelper.java b/iam-login-service/src/main/java/it/infn/mw/iam/authn/util/SessionTimeoutHelper.java
@@ -34,7 +34,7 @@ public class SessionTimeoutHelper {
   final long timeoutInSecs;
 
   @Autowired
-  public SessionTimeoutHelper(Clock clock, @Value("${server.session.timeout}")long timeoutInSecs) {
+  public SessionTimeoutHelper(Clock clock, @Value("${spring.session.timeout}") long timeoutInSecs) {
     this.clock = clock;
     this.timeoutInSecs = timeoutInSecs;
   }

diff --git a/...src/main/java/it/infn/mw/iam/config/client_registration/ClientRegistrationProperties.java b/...src/main/java/it/infn/mw/iam/config/client_registration/ClientRegistrationProperties.java
@@ -20,7 +20,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-@ConfigurationProperties("clientRegistration")
+@ConfigurationProperties("client-registration")
 @Configuration
 public class ClientRegistrationProperties {
 

diff --git a/iam-login-service/src/main/resources-filtered/application.properties b/iam-login-service/src/main/resources-filtered/application.properties
@@ -24,13 +24,13 @@ info.app.java.target=${java.version}
 # The Audit log default
 logging.level.AUDIT=INFO
 
-logging.level.=WARN
 logging.level.root=WARN
 
 logging.level.it.infn.mw=INFO
 logging.level.org.opensaml.saml2.metadata.provider=INFO
+logging.level.org.flywaydb.core.internal.command=INFO
 
-#logging.level.=DEBUG
+# Turn everything to DEBUG?
 #logging.level.root=DEBUG
 
 # Flyway Log

diff --git a/iam-login-service/src/main/resources/application.yml b/iam-login-service/src/main/resources/application.yml
@@ -21,8 +21,7 @@ server:
   port: ${IAM_PORT:8080}
 
   tomcat:
-    additional-tld-skip-patterns:
-    - "*.jar"
+
     accesslog:
       enabled: ${IAM_TOMCAT_ACCESS_LOG_ENABLED:false}
       directory: ${IAM_TOMCAT_ACCESS_LOG_DIRECTORY:/tmp}

diff --git a/iam-login-service/src/test/java/it/infn/mw/iam/test/oauth/ClientRegistrationAuthzTests.java b/iam-login-service/src/test/java/it/infn/mw/iam/test/oauth/ClientRegistrationAuthzTests.java
@@ -32,7 +32,7 @@
 
 @RunWith(SpringRunner.class)
 @IamMockMvcIntegrationTest
-@TestPropertySource(properties= {"clientRegistration.allowFor=REGISTERED_USERS"})
+@TestPropertySource(properties = {"client-registration.allow-for=REGISTERED_USERS"})
 public class ClientRegistrationAuthzTests extends ClientRegistrationTestSupport {
 
   @Autowired