Uplifted spring-boot to 2.7.5 (#259)

* Uplifted spring-boot to 2.7.5
------

Co-authored-by: Vishnu <[email protected]>
Co-authored-by: z-sztrom <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.29
+- Uplifted eiffel-remrem-parent version to 2.0.10 to inherit the latest spring-boot version.
+
 ## 2.0.28
 - Made changes to override AMQP Basic properties.
 - Swagger don't display default status codes

pom.xml

@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.eiffel-community</groupId>
         <artifactId>eiffel-remrem-parent</artifactId>
-        <version>2.0.9</version>
+        <version>2.0.10</version>
     </parent>
     <properties>
-        <eiffel-remrem-publish.version>2.0.28</eiffel-remrem-publish.version>
+        <eiffel-remrem-publish.version>2.0.29</eiffel-remrem-publish.version>
         <eiffel-remrem-semantics.version>2.2.4</eiffel-remrem-semantics.version>
     </properties>
     <artifactId>eiffel-remrem-publish</artifactId>

publish-cli/pom.xml

@@ -113,6 +113,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.junit.jupiter</groupId>
+            		<artifactId>junit-jupiter</artifactId>
+            	</exclusion>
+            	<exclusion>
+            		<groupId>org.mockito</groupId>
+            		<artifactId>mockito-junit-jupiter</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
@@ -132,7 +142,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.5</version>
+                <version>${springboot.version}</version>
                 <configuration>
                     <mainClass>com.ericsson.eiffel.remrem.publish.cli.CLI</mainClass>
                     <skip>false</skip>

publish-cli/src/main/java/com/ericsson/eiffel/remrem/publish/cli/CLI.java

@@ -27,6 +27,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 
@@ -179,7 +180,7 @@ public static void main(String args[]) {
         application.addInitializers(new SpringLoggingInitializer());
         application.setBannerMode(Banner.Mode.OFF);
         application.setLogStartupInfo(false);
-        application.setWebEnvironment(false);
+        application.setWebApplicationType(WebApplicationType.NONE);
         CliOptions.parse(args);
         application.run(args);
     }

publish-common/pom.xml

@@ -115,7 +115,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.14.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

publish-service/pom.xml

@@ -154,6 +154,10 @@
                     <artifactId>json-path</artifactId>
                     <groupId>com.jayway.jsonpath</groupId>
                 </exclusion>
+                <exclusion>
+                	<groupId>org.junit.jupiter</groupId>
+                	<artifactId>junit-jupiter</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
@@ -162,7 +166,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.5</version>
+                <version>${springboot.version}</version>
                 <configuration>
                     <mainClass>com.ericsson.eiffel.remrem.publish.App</mainClass>
                     <skip>false</skip>

publish-service/src/main/java/com/ericsson/eiffel/remrem/publish/App.java

@@ -16,6 +16,7 @@
 
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -35,7 +36,7 @@ public static void main(String[] args) {
         application.addInitializers(new SpringLoggingInitializer());
         application.setBannerMode(Banner.Mode.OFF);
         application.setLogStartupInfo(false);
-        application.setWebEnvironment(true);    
+        application.setWebApplicationType(WebApplicationType.SERVLET); 
         ApplicationContext ctx = application.run(args); 
     }
 }

publish-service/src/main/java/com/ericsson/eiffel/remrem/publish/config/SecurityConfig.java

@@ -82,7 +82,6 @@ protected void configureGlobal(AuthenticationManagerBuilder auth) throws Excepti
         auth.ldapAuthentication().userSearchFilter(userSearchFilter).contextSource(ldapContextSource());
     }
 
-    @Bean
     public BaseLdapPathContextSource ldapContextSource() {
         LdapContextSource ldap = new LdapContextSource();
         ldap.setUrl(ldapUrl);
@@ -92,6 +91,7 @@ public BaseLdapPathContextSource ldapContextSource() {
         HashMap<String, Object> environment = new HashMap<>();
         environment.put("com.sun.jndi.ldap.connect.timeout", Integer.toString(getTimeOut()));
         ldap.setBaseEnvironmentProperties(environment);
+        ldap.afterPropertiesSet();
         return ldap;
     }
 

publish-service/src/main/java/com/ericsson/eiffel/remrem/publish/config/SwaggerConfig.java

@@ -14,9 +14,28 @@
 */
 package com.ericsson.eiffel.remrem.publish.config;
 
-import io.swagger.annotations.Api;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
+import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
+import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver;
+import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
+import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
+import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
+import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
+import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
+import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
+import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.util.StringUtils;
+
+import io.swagger.annotations.Api;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -48,6 +67,31 @@ public UiConfiguration uiConfig() {
     				null);
         }
 
+        @Bean
+        public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpointsSupplier webEndpointsSupplier,
+                ServletEndpointsSupplier servletEndpointsSupplier, ControllerEndpointsSupplier controllerEndpointsSupplier,
+                EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties,
+                WebEndpointProperties webEndpointProperties, Environment environment) {
+            List<ExposableEndpoint<?>> allEndpoints = new ArrayList();
+            Collection<ExposableWebEndpoint> webEndpoints = webEndpointsSupplier.getEndpoints();
+            allEndpoints.addAll(webEndpoints);
+            allEndpoints.addAll(servletEndpointsSupplier.getEndpoints());
+            allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints());
+            String basePath = webEndpointProperties.getBasePath();
+            EndpointMapping endpointMapping = new EndpointMapping(basePath);
+            boolean shouldRegisterLinksMapping = this.shouldRegisterLinksMapping(webEndpointProperties, environment,
+                    basePath);
+            return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes,
+                    corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath),
+                    shouldRegisterLinksMapping, null);
+        }
+
+        private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment,
+                String basePath) {
+            return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath)
+                || ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT));
+        }
+
         private ApiInfo metaData() {
                 final StringBuilder remremDescription = new StringBuilder();
                 remremDescription.append("REMReM (REST Mailbox for Registered Messages) Publish "

publish-service/src/main/resources/application.properties

@@ -2,6 +2,8 @@
 server.port=8080
 debug: false
 
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
+
 #Logging configurations 
 logging.level.root: INFO
 logging.level.org.springframework.web: INFO