diff options
-rw-r--r-- | pom.xml | 35 | ||||
-rw-r--r-- | sdc-workflow-designer-be/pom.xml | 17 | ||||
-rw-r--r-- | sdc-workflow-designer-init/pom.xml | 1 | ||||
-rw-r--r-- | sdc-workflow-designer-ui/pom.xml | 1 |
4 files changed, 40 insertions, 14 deletions
@@ -33,9 +33,6 @@ <packaging>pom</packaging> <properties> - <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -52,12 +49,13 @@ <sonar.coverage.jacoco.xmlReportPaths> ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml </sonar.coverage.jacoco.xmlReportPaths> + <docker.api.version>1.41</docker.api.version> </properties> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>3.2.0</version> <relativePath/> </parent> @@ -72,18 +70,23 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.10.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.0</version> + <version>2.22.2</version> </plugin> <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.2</version> + <version>0.8.8</version> </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.38.0</version> <configuration> <verbose>false</verbose> <registry>${nexus.registry}</registry> @@ -111,12 +114,26 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>3.1.2</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>11</source> + <target>11</target> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${maven-checkstyle-plugin.version}</version> <configuration> <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> @@ -222,4 +239,4 @@ </site> </distributionManagement> -</project>
\ No newline at end of file +</project> diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml index 29858163..066cf449 100644 --- a/sdc-workflow-designer-be/pom.xml +++ b/sdc-workflow-designer-be/pom.xml @@ -23,6 +23,7 @@ <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> + <zusammen.version>1.0.2</zusammen.version> </properties> <dependencyManagement> @@ -295,16 +296,21 @@ <artifactId>jaxb-api</artifactId> <version>${jaxb.api.version}</version> </dependency> + <dependency> + <groupId>com.amdocs.zusammen</groupId> + <artifactId>zusammen-sdk</artifactId> + <version>${zusammen.version}</version> + </dependency> + <dependency> + <groupId>com.amdocs.zusammen</groupId> + <artifactId>zusammen-commons-configuration</artifactId> + <version>${zusammen.version}</version> + </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> - </plugin> - <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <version>${spring.boot.version}</version> @@ -354,6 +360,7 @@ <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <configuration> + <apiVersion>${docker.api.version}</apiVersion> <images> <image> <name>onap/sdc-workflow-backend</name> diff --git a/sdc-workflow-designer-init/pom.xml b/sdc-workflow-designer-init/pom.xml index 5c6b2b7c..da24046d 100644 --- a/sdc-workflow-designer-init/pom.xml +++ b/sdc-workflow-designer-init/pom.xml @@ -25,6 +25,7 @@ <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <configuration> + <apiVersion>${docker.api.version}</apiVersion> <images> <image> <name>onap/sdc-workflow-init</name> diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml index 49a4e8a7..e08f98f7 100644 --- a/sdc-workflow-designer-ui/pom.xml +++ b/sdc-workflow-designer-ui/pom.xml @@ -185,6 +185,7 @@ <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <configuration> + <apiVersion>${docker.api.version}</apiVersion> <images> <image> <name>onap/sdc-workflow-frontend</name> |