From 8cc9e64a23ab773440a1f51d604a09c78f160283 Mon Sep 17 00:00:00 2001 From: ajay_dp001 Date: Fri, 29 Jan 2021 17:44:27 +0530 Subject: [DCAE-dfc] Vulnerability Removal for Datafile Collector - swagger version 2.9.2 to 3.0.0 - commons-io version 1.3.2 to 2.8.0 - tomcat-embed-core version 9.0.36 to 9.0.39 - pom.xml refactoring Issue-ID: DCAEGEN2-2591 Signed-off-by: ajay_dp001 Change-Id: I40e65a6936fc118299cd575df34c51730a25f424 --- datafile-app-server/config/application.yaml | 4 + datafile-app-server/pom.xml | 502 +++++++-------- .../onap/dcaegen2/collectors/datafile/MainApp.java | 5 +- .../datafile/configuration/SwaggerConfig.java | 73 +-- .../datafile/controllers/ScheduleController.java | 16 +- .../datafile/controllers/StatusController.java | 15 +- pom.xml | 675 +++++++++++---------- version.properties | 2 +- 8 files changed, 632 insertions(+), 660 deletions(-) diff --git a/datafile-app-server/config/application.yaml b/datafile-app-server/config/application.yaml index d3cced84..bd589e98 100644 --- a/datafile-app-server/config/application.yaml +++ b/datafile-app-server/config/application.yaml @@ -25,3 +25,7 @@ logging: file: /var/log/ONAP/application.log app: filepath: config/datafile_endpoints_test.json + +springdoc: + show-actuator: true + swagger-ui.disable-swagger-default-url: true \ No newline at end of file diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index fec9e191..353b375b 100644 --- a/datafile-app-server/pom.xml +++ b/datafile-app-server/pom.xml @@ -1,7 +1,8 @@ - - org.springframework.boot - spring-boot-starter-actuator - - - javax.xml.bind - jaxb-api - + + + org.onap.dcaegen2.services.sdk.rest.services + cbs-client + + + org.onap.dcaegen2.services.sdk.rest.services + dmaap-client + + + org.onap.dcaegen2.services.sdk.security + ssl + + + org.apache.httpcomponents + httpasyncclient + + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + + commons-net + commons-net + + + com.jcraft + jsch + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.immutables + value + + + javax.validation + validation-api + + + org.springframework.boot + spring-boot + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + com.spotify + docker-client + ${docker-client.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed-core.version} + + + org.springframework + spring-webflux + + + org.springframework.boot + spring-boot-autoconfigure + - - - io.projectreactor - reactor-test - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.testng - testng - test - - - org.awaitility - awaitility - test - - - org.mockito - mockito-junit-jupiter - test - + + + org.springframework.boot + spring-boot-starter-actuator + + + javax.xml.bind + jaxb-api + - - - io.springfox - springfox-swagger2 - - - javax.validation - validation-api - - - org.springframework.boot - spring-boot - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - com.spotify - docker-client - 8.7.1 - - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.36 - - - org.springframework - spring-webflux - - - org.springframework.boot - spring-boot-autoconfigure - - - io.springfox - springfox-swagger-ui - - + + + io.projectreactor + reactor-test + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.testng + testng + test + + + org.awaitility + awaitility + test + + + org.mockito + mockito-junit-jupiter + test + - - - - io.projectreactor - reactor-bom - ${projectreactor.version} - pom - import - + + + io.springfox + springfox-spring-web + + + io.springfox + springfox-spi + + + io.springfox + springfox-core + + + org.springdoc + springdoc-openapi-ui + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + org.springdoc + springdoc-openapi-data-rest + + + com.fasterxml.jackson.core + jackson-databind + - - - - - - src/main/resources - - - - - org.springframework.boot - spring-boot-maven-plugin - - ${project.artifactId} - org.onap.dcaegen2.collectors.datafile.MainApp - - - - - build-info - - - - - - com.spotify - docker-maven-plugin - - ${onap.nexus.dockerregistry.daily} - ${onap.nexus.dockerregistry.daily}/${docker.image.name} - - ${project.version}-${maven.build.timestamp}Z - ${project.version} - latest - - ${project.basedir}/src/main/docker - + + - ${project.build.directory} - ${project.artifactId}.jar - /target + src/main/resources - - /config - ${project.basedir}/config - * - - - - - + - - pl.project13.maven - git-commit-id-plugin - - - get-the-git-infos - - revision - - - - - true - ${project.basedir}/.git - MM-dd-yyyy '@' HH:mm:ss Z - true - ${project.build.outputDirectory}/git.properties - true - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + ${project.artifactId} + org.onap.dcaegen2.collectors.datafile.MainApp + + + + + build-info + + + + + + com.spotify + docker-maven-plugin + + ${onap.nexus.dockerregistry.daily} + ${onap.nexus.dockerregistry.daily}/${docker.image.name} + + ${project.version}-${maven.build.timestamp}Z + ${project.version} + latest + + ${project.basedir}/src/main/docker + + + ${project.build.directory} + ${project.artifactId}.jar + /target + + + /config + ${project.basedir}/config + * + + + + + + pl.project13.maven + git-commit-id-plugin + + + get-the-git-infos + + revision + + + + + true + ${project.basedir}/.git + MM-dd-yyyy '@' HH:mm:ss Z + true + ${project.build.outputDirectory}/git.properties + + true + + + + diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/MainApp.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/MainApp.java index 55f4fe73..520be3fe 100644 --- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/MainApp.java +++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/MainApp.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2018 NOKIA Intellectual Property, 2018 Nordix Foundation. All rights reserved. + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +33,7 @@ import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler; * @author Przemysław Wąsala on 3/23/18 * @author Henrik Andersson */ -@SpringBootApplication(exclude = {JacksonAutoConfiguration.class}) +@SpringBootApplication() @EnableScheduling public class MainApp { diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/SwaggerConfig.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/SwaggerConfig.java index 1990efb8..35a31597 100644 --- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/SwaggerConfig.java +++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/SwaggerConfig.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2018 NOKIA Intellectual Property, 2018 Nordix Foundation. All rights reserved. + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,65 +19,21 @@ package org.onap.dcaegen2.collectors.datafile.configuration; -import com.google.common.base.Predicates; +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.info.Info; +import io.swagger.v3.oas.annotations.info.License; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +@OpenAPIDefinition( + info = @Info(title = SwaggerConfig.API_TITLE, version = SwaggerConfig.VERSION, + description = SwaggerConfig.DESCRIPTION, license = @License(name = "Copyright (C) 2020 Nordix Foundation. Licensed under the Apache License.", + url = "http://www.apache.org/licenses/LICENSE-2.0")) +) +public class SwaggerConfig { -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; + public static final String VERSION = "1.0"; + public static final String API_TITLE = "DATAFILE App Server"; + static final String DESCRIPTION = "

This page lists all the rest apis for DATAFILE app server.

"; -@EnableSwagger2 -@Configuration -@Profile("prod") -public class SwaggerConfig extends WebMvcConfigurationSupport { - static final String API_TITLE = "DATAFILE app server"; - static final String DESCRIPTION = "This page lists all the rest apis for DATAFILE app server."; - static final String VERSION = "1.0"; - static final String RESOURCES_PATH = "classpath:/META-INF/resources/"; - static final String WEBJARS_PATH = RESOURCES_PATH + "webjars/"; - static final String SWAGGER_UI = "swagger-ui.html"; - static final String WEBJARS = "/webjars/**"; - - /** - * Gets the API info. - * - * @return the API info. - */ - @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2) // - .apiInfo(apiInfo()) // - .select() // - .apis(RequestHandlerSelectors.any()) // - .paths(PathSelectors.any()) // - .paths(Predicates.not(PathSelectors.regex("/error"))) // - // this endpoint is not implemented, but was visible for Swagger - .build(); - } - - private static ApiInfo apiInfo() { - return new ApiInfoBuilder() // - .title(API_TITLE) // - .description(DESCRIPTION) // - .version(VERSION) // - .build(); - } - - @Override - protected void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler(SWAGGER_UI) // - .addResourceLocations(RESOURCES_PATH); - - registry.addResourceHandler(WEBJARS) // - .addResourceLocations(WEBJARS_PATH); + private SwaggerConfig() { } } diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/ScheduleController.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/ScheduleController.java index 16cd05de..aeb4c729 100644 --- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/ScheduleController.java +++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/ScheduleController.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2018 NOKIA Intellectual Property, 2018-2019 Nordix Foundation. All rights reserved. + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,9 +19,8 @@ package org.onap.dcaegen2.collectors.datafile.controllers; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.onap.dcaegen2.collectors.datafile.configuration.SchedulerConfig; import org.onap.dcaegen2.collectors.datafile.model.logging.MappedDiagnosticContext; import org.slf4j.Logger; @@ -42,7 +42,7 @@ import reactor.core.publisher.Mono; */ @RestController -@Api(value = "ScheduleController") +@Tag(name = "ScheduleController") public class ScheduleController { private static final Logger logger = LoggerFactory.getLogger(ScheduleController.class); @@ -61,7 +61,7 @@ public class ScheduleController { * @return the response. */ @GetMapping("/start") - @ApiOperation(value = "Start scheduling worker request") + @Operation(summary = "Start scheduling worker request") public Mono> startTasks(@RequestHeader HttpHeaders headers) { MappedDiagnosticContext.initializeTraceContext(headers); logger.info(MappedDiagnosticContext.ENTRY, "Start request"); @@ -81,7 +81,7 @@ public class ScheduleController { * @return the response. */ @GetMapping("/stopDatafile") - @ApiOperation(value = "Receiving stop scheduling worker request") + @Operation(summary = "Receiving stop scheduling worker request") public Mono> stopTask(@RequestHeader HttpHeaders headers) { MappedDiagnosticContext.initializeTraceContext(headers); logger.info(MappedDiagnosticContext.ENTRY, "Stop request"); @@ -90,7 +90,7 @@ public class ScheduleController { return response; } - @ApiOperation(value = "Sends success or error response on starting task execution") + @Operation(summary = "Sends success or error response on starting task execution") private static ResponseEntity createStartTaskResponse(boolean wasScheduled) { if (wasScheduled) { return new ResponseEntity<>("Datafile Service has been started!", HttpStatus.CREATED); diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/StatusController.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/StatusController.java index 5b72df1a..aaebfbfd 100644 --- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/StatusController.java +++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/controllers/StatusController.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2018 NOKIA Intellectual Property, 2018 Nordix Foundation. All rights reserved. + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -19,11 +20,10 @@ package org.onap.dcaegen2.collectors.datafile.controllers; import static org.onap.dcaegen2.collectors.datafile.model.logging.MappedDiagnosticContext.ENTRY; import static org.onap.dcaegen2.collectors.datafile.model.logging.MappedDiagnosticContext.EXIT; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; - +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.onap.dcaegen2.collectors.datafile.model.Counters; import org.onap.dcaegen2.collectors.datafile.model.logging.MappedDiagnosticContext; import org.onap.dcaegen2.collectors.datafile.tasks.ScheduledTasks; @@ -42,7 +42,7 @@ import reactor.core.publisher.Mono; * REST Controller to check the heart beat and status of the DFC. */ @RestController -@Api(value = "StatusController") +@Tag(name = "StatusController") public class StatusController { private static final Logger logger = LoggerFactory.getLogger(StatusController.class); @@ -60,7 +60,7 @@ public class StatusController { * @return the heart beat status of DFC. */ @GetMapping("/heartbeat") - @ApiOperation(value = "Returns liveness of DATAFILE service") + @Operation(summary = "Returns liveness of DATAFILE service") @ApiResponses( value = { // @ApiResponse(code = 200, message = "DATAFILE service is living"), @@ -85,7 +85,7 @@ public class StatusController { * @return information. */ @GetMapping("/status") - @ApiOperation(value = "Returns status and statistics of DATAFILE service") + @Operation(summary = "Returns status and statistics of DATAFILE service") @ApiResponses( value = { // @ApiResponse(code = 200, message = "DATAFILE service is living"), @@ -101,5 +101,4 @@ public class StatusController { logger.info(EXIT, "Status request"); return response; } - } diff --git a/pom.xml b/pom.xml index 4336cc87..7f328cda 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,8 @@ - 1.7.25 - 1.2.3 + + 11 + 1.5.0 + 4.1.4 + 3.6 + 2.7.1 + 5.3.1 + 2.4.0 + 2.8.0 + 3.3 + 2020.0.2 - - true - 5.5.2 - 1.3.2 - 2.23.4 - 6.14.2 - 0.1.54 - 2.9.2 - 3.1.6 + + 1.7.25 + 1.2.3 - - 3.1.0 - 2.22.0 - 1.2.1 - 2.2.4 - - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - - + + true + 5.5.2 + 1.3.2 + 2.23.4 + 6.14.2 + 0.1.54 + 3.0.0 + 3.1.6 + 2.11.4 - - - - org.onap.dcaegen2.services.sdk.rest.services - cbs-client - ${sdk.version} - - - org.onap.dcaegen2.services.sdk.rest.services - dmaap-client - ${sdk.version} - - - org.onap.dcaegen2.services.sdk.security - ssl - ${sdk.version} - - - org.apache.httpcomponents - httpasyncclient - ${apache.httpcomponents.version} - - - org.onap.dcaegen2.services.sdk.rest.services - common-dependency - ${sdk.version} - - - org.apache.commons - commons-lang3 - ${apache.commons.version} - - - org.immutables - value - ${immutable.version} - provided - - - org.immutables - gson - ${immutable.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-webflux - ${spring.version} - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - commons-io - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - com.jcraft - jsch - ${jcraft.version} - - - ch.qos.logback - logback-classic - ${logback.version} - provided - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.testng - testng - ${testng.version} - test - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot.version} - test - - - org.awaitility - awaitility - ${awaitility.version} - test - + + 3.1.0 + 2.22.0 + 1.2.1 + 2.2.4 + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + + 1.5.3 + - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - io.springfox - springfox-swagger-ui - ${springfox.version} - - - io.projectreactor - reactor-bom - ${projectreactor.version} - pom - import - - - + + + + org.onap.dcaegen2.services.sdk.rest.services + cbs-client + ${sdk.version} + + + org.onap.dcaegen2.services.sdk.rest.services + dmaap-client + ${sdk.version} + + + org.onap.dcaegen2.services.sdk.security + ssl + ${sdk.version} + + + org.apache.httpcomponents + httpasyncclient + ${apache.httpcomponents.version} + + + org.onap.dcaegen2.services.sdk.rest.services + common-dependency + ${sdk.version} + + + org.apache.commons + commons-lang3 + ${apache.commons.version} + + + org.immutables + value + ${immutable.version} + provided + + + org.immutables + gson + ${immutable.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-webflux + ${spring.version} + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + commons-io + commons-io + ${commons-io.version} + + + commons-net + commons-net + ${commons-net.version} + + + com.jcraft + jsch + ${jcraft.version} + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.testng + testng + ${testng.version} + test + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + org.awaitility + awaitility + ${awaitility.version} + test + - - datafile-app-server - + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + io.springfox + springfox-swagger-ui + ${springfox.version} + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi-ui.version} + + + org.springdoc + springdoc-openapi-data-rest + ${springdoc-openapi-ui.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + io.springfox + springfox-spring-web + ${springfox.version} + + + io.springfox + springfox-spi + ${springfox.version} + + + io.springfox + springfox-core + ${springfox.version} + + + io.projectreactor + reactor-bom + ${projectreactor.version} + pom + import + + + - - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit-platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - - - - - com.spotify - docker-maven-plugin - ${docker-maven-plugin.version} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - org.apache.maven.plugins - maven-enforcer-plugin - - true - - - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - - net.revelc.code.formatter - formatter-maven-plugin - 2.8.1 - - ${project.parent.basedir}/onap-java-formatter.xml - - - - - com.diffplug.spotless - spotless-maven-plugin - 1.18.0 - - - - - com,java,javax,org - - - - - - - - + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + true + true + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.junit.platform + junit-platform-surefire-provider + ${junit-platform.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + + + + + com.spotify + docker-maven-plugin + ${docker-maven-plugin.version} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + true + + + + pl.project13.maven + git-commit-id-plugin + ${git-commit-id-plugin.version} + + + net.revelc.code.formatter + formatter-maven-plugin + 2.8.1 + + ${project.parent.basedir}/onap-java-formatter.xml + + + + + com.diffplug.spotless + spotless-maven-plugin + 1.18.0 + + + + + com,java,javax,org + + + + + + + + diff --git a/version.properties b/version.properties index d7bbc36b..80408f3b 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=5 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg