diff --git a/CHANGELOG.md b/CHANGELOG.md index b733a206..bdd6d7a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.10.1 +- Updated versions of few dependencies. + ## 0.10.0 - Removed based64 encryption mechanism for ldap manager password diff --git a/build.gradle b/build.gradle index e9ec177a..017d4a5f 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ subprojects { targetCompatibility = 1.8 //Latest version for generate - version = "0.10.0" + version = "0.10.1" repositories { mavenCentral() @@ -64,17 +64,17 @@ subprojects { } dependencies { - //Injectable Message Library and its Implementation - compile("com.github.Ericsson:eiffel-remrem-shared:0.3.5") - compile("com.github.Ericsson:eiffel-remrem-semantics:0.4.1") - + //Injectable Message Library its Implementation + compile("com.github.Ericsson:eiffel-remrem-shared:0.3.6") + compile("com.github.Ericsson:eiffel-remrem-semantics:0.4.4") + //Authentication compile("org.springframework.boot:spring-boot-starter-security:$sprintBootVersion") compile("org.springframework.security:spring-security-ldap:4.1.3.RELEASE") compile("org.apache.directory.server:apacheds-server-jndi:1.5.5") - compile 'com.github.ulisesbocchio:jasypt-spring-boot-starter:2.0.0' - // Test framework - testCompile("junit:junit:4.12") + compile 'com.github.ulisesbocchio:jasypt-spring-boot-starter:2.0.0' + // Test framework + testCompile("junit:junit:4.12") testCompile("org.assertj:assertj-core:3.4.1") testCompile("org.springframework.boot:spring-boot-starter-test:$sprintBootVersion") } diff --git a/cli/build.gradle b/cli/build.gradle index 29e8277f..129bdc02 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -110,12 +110,12 @@ repositories { //Dependencies for remrem-generate-cli dependencies { - compile 'org.slf4j:slf4j-api:1.7.13' + compile 'org.slf4j:slf4j-api:1.7.25' //commons CLI compile 'commons-cli:commons-cli:1.3.1' - compile 'javax.servlet:javax.servlet-api:3.0.1' + compile 'javax.servlet:javax.servlet-api:4.0.0' // Will be used to package contents of third party libs runtime fileTree(dir: 'libs', include: '*.jar') } diff --git a/service/build.gradle b/service/build.gradle index 34ded1a7..e50037e2 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -115,11 +115,11 @@ dependencies { testCompile("org.springframework.boot:spring-boot-starter-tomcat") //gson support - compile('com.google.code.gson:gson:2.6.2') + compile('com.google.code.gson:gson:2.8.1') //swagger UI - compile 'io.springfox:springfox-swagger2:2.4.0' - compile 'io.springfox:springfox-swagger-ui:2.4.0' + compile 'io.springfox:springfox-swagger2:2.6.1' + compile 'io.springfox:springfox-swagger-ui:2.6.1' // tag::actuator[] compile("org.springframework.boot:spring-boot-starter-actuator:$sprintBootVersion") diff --git a/service/src/main/java/com/ericsson/eiffel/remrem/generate/App.java b/service/src/main/java/com/ericsson/eiffel/remrem/generate/App.java index 17d6f44a..502dbfde 100644 --- a/service/src/main/java/com/ericsson/eiffel/remrem/generate/App.java +++ b/service/src/main/java/com/ericsson/eiffel/remrem/generate/App.java @@ -30,15 +30,15 @@ @PropertySource(value = "file:${catalina.home}/conf/config.properties", ignoreResourceNotFound = true) public class App extends SpringBootServletInitializer { - public static void main(String[] args) { - startService(args); - } + public static void main(String[] args) { + startService(args); + } - private static void startService(String[] args) { - SpringApplication application = new SpringApplication(App.class); - application.setBannerMode(Banner.Mode.OFF); - application.setLogStartupInfo(false); - application.setWebEnvironment(true); - ApplicationContext ctx = application.run(args); - } + private static void startService(String[] args) { + SpringApplication application = new SpringApplication(App.class); + application.setBannerMode(Banner.Mode.OFF); + application.setLogStartupInfo(false); + application.setWebEnvironment(true); + ApplicationContext ctx = application.run(args); + } } \ No newline at end of file diff --git a/service/src/main/java/com/ericsson/eiffel/remrem/generate/config/SwaggerConfig.java b/service/src/main/java/com/ericsson/eiffel/remrem/generate/config/SwaggerConfig.java index d928e063..8d7c9f64 100644 --- a/service/src/main/java/com/ericsson/eiffel/remrem/generate/config/SwaggerConfig.java +++ b/service/src/main/java/com/ericsson/eiffel/remrem/generate/config/SwaggerConfig.java @@ -25,6 +25,7 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger.web.UiConfiguration; +import springfox.documentation.swagger.web.UiConfiguration.Constants; import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration @@ -41,12 +42,11 @@ public Docket api() { .apiInfo(metaData()); } - @Bean - public UiConfiguration uiConfig() { - return new UiConfiguration( - null, "list", "alpha", "schema",false, true - ); - } + @Bean + public UiConfiguration uiConfig() { + return new UiConfiguration(null, "list", "alpha", "schema", Constants.DEFAULT_SUBMIT_METHODS, false, true, + null); + } private ApiInfo metaData() { final StringBuilder remremDescription = new StringBuilder();