diff options
| -rw-r--r-- | pom.xml | 28 | ||||
| -rw-r--r-- | sdc-workflow-designer-be/pom.xml | 31 |
2 files changed, 42 insertions, 17 deletions
@@ -15,9 +15,9 @@ --> <project - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -41,17 +41,17 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <sdc.project.version>${project.version}</sdc.project.version> <sdc.build.timestamp>${maven.build.timestamp}</sdc.build.timestamp> - <onap.version>1.3.0</onap.version> + <onap.version>1.5.0</onap.version> <docker.optimize>true</docker.optimize> <docker.username>docker</docker.username> <docker.password>docker</docker.password> <nexus.registry>nexus3.onap.org:10001</nexus.registry> <nexus.proxy>https://nexus.onap.org</nexus.proxy> <sitePath>/content/sites/site/org/onap/sdc/workflow/${project.version}</sitePath> - <!-- Sonar properties --> - <sonar.coverage.jacoco.xmlReportPaths> - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> + <!-- Sonar properties --> + <sonar.coverage.jacoco.xmlReportPaths> + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + </sonar.coverage.jacoco.xmlReportPaths> </properties> <parent> @@ -167,16 +167,16 @@ <source> println 'Docker Tagging Script:' + project.properties['sdc.project.version'] + '/' + project.properties['sdc.build.timestamp']; def versionArray; - if ( project.properties['sdc.project.version'] != null ) { + if (project.properties['sdc.project.version'] != null) { versionArray = project.properties['sdc.project.version'].split('\\.'); } - if ( project.properties['sdc.project.version'].endsWith("-SNAPSHOT") ) { - project.properties.setProperty('project.docker.latesttag.version',versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"); - project.properties.setProperty('project.docker.latesttagtimestamp.version',versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-"+project.properties['sdc.build.timestamp']); + if (project.properties['sdc.project.version'].endsWith("-SNAPSHOT")) { + project.properties.setProperty('project.docker.latesttag.version', versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"); + project.properties.setProperty('project.docker.latesttagtimestamp.version', versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-" + project.properties['sdc.build.timestamp']); } else { - project.properties.setProperty('project.docker.latesttag.version',versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"); - project.properties.setProperty('project.docker.latesttagtimestamp.version',versionArray[0] + '.' + versionArray[1] + "-STAGING-"+project.properties['sdc.build.timestamp']); + project.properties.setProperty('project.docker.latesttag.version', versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"); + project.properties.setProperty('project.docker.latesttagtimestamp.version', versionArray[0] + '.' + versionArray[1] + "-STAGING-" + project.properties['sdc.build.timestamp']); } println 'New Tags for docker:' + project.properties['project.docker.latesttag.version'] + '/' + project.properties['project.docker.latesttagtimestamp.version']; diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml index 48e5a8b3..0d729b05 100644 --- a/sdc-workflow-designer-be/pom.xml +++ b/sdc-workflow-designer-be/pom.xml @@ -14,14 +14,15 @@ </parent> <properties> - <spring.boot.version>2.6.4</spring.boot.version> - <org.springframework.version>5.3.13</org.springframework.version> + <spring.boot.version>2.1.18.RELEASE</spring.boot.version> + <org.springframework.version>5.1.19.RELEASE</org.springframework.version> <mapstruct.version>1.3.1.Final</mapstruct.version> <lombok.version>1.18.0</lombok.version> <springfox.version>3.0.0</springfox.version> <jaxb.api.version>2.3.0</jaxb.api.version> <org.glassfish.version>4.0.2</org.glassfish.version> <mockito.version>3.7.7</mockito.version> + <springframework.plugin.version>2.0.0.RELEASE</springframework.plugin.version> </properties> <dependencyManagement> @@ -122,6 +123,11 @@ </exclusions> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>4.1.75.Final</version> + </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> <scope>runtime</scope> @@ -141,6 +147,26 @@ <groupId>io.springfox</groupId> <artifactId>springfox-boot-starter</artifactId> <version>${springfox.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-metadata</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-core</artifactId> + <version>${springframework.plugin.version}</version> + </dependency> + <dependency> + <groupId>org.springframework.plugin</groupId> + <artifactId>spring-plugin-metadata</artifactId> + <version>${springframework.plugin.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc</groupId> @@ -352,4 +378,3 @@ </profiles> </project> - |