diff options
author | 2020-04-21 05:57:59 +0000 | |
---|---|---|
committer | 2020-04-21 05:57:59 +0000 | |
commit | 245f62cd9e2a0ced2be03e5fff04fa86ea505596 (patch) | |
tree | 857d4c4ae9afb209218e5de2b02adc01e37754cc | |
parent | 5d2e94a8c315f62363e21030c73db7b59ded7872 (diff) | |
parent | cc7a734ffb1a8c38bbcbea6a7a5aead3d25b713b (diff) |
Merge "Extract versions to properties"
-rw-r--r-- | netconfsimulator/pom.xml | 96 | ||||
-rw-r--r-- | pnfsimulator/pom.xml | 146 | ||||
-rw-r--r-- | pom.xml | 6 |
3 files changed, 143 insertions, 105 deletions
diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml index b000f1c..915a045 100644 --- a/netconfsimulator/pom.xml +++ b/netconfsimulator/pom.xml @@ -55,9 +55,27 @@ <skip-integration-tests>true</skip-integration-tests> <skip-unit-tests>false</skip-unit-tests> <project.build.integrationTestSourceDirectory>${project.basedir}/src/it/java</project.build.integrationTestSourceDirectory> + <lombok.version>1.18.2</lombok.version> + <jnc.version>1.0</jnc.version> + <javax.websocket-api.version>1.1</javax.websocket-api.version> + <assertj-core.version>3.9.1</assertj-core.version> + <mockito-core.version>2.18.3</mockito-core.version> + <junit-jupiter-engine.version>5.3.1</junit-jupiter-engine.version> + <junit-vintage-engine.version>5.3.1</junit-vintage-engine.version> + <junit.version>4.12</junit.version> + <before-after-spring-test-runner.version>0.1.0</before-after-spring-test-runner.version> + <docker-compose-rule-junit4.version>0.29.1</docker-compose-rule-junit4.version> + <httpclient.version>4.5.6</httpclient.version> + <httpmime.version>4.5.6</httpmime.version> + <springfox-swagger2.version>2.9.2</springfox-swagger2.version> + <springfox-swagger-ui.version>2.9.2</springfox-swagger-ui.version> + <build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version> </properties> <dependencies> + + <!-- Compile DEPENDENCIES --> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> @@ -71,13 +89,13 @@ <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.2</version> + <version>${lombok.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onosproject</groupId> <artifactId>jnc</artifactId> - <version>1.0</version> + <version>${jnc.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -87,10 +105,30 @@ <dependency> <groupId>javax.websocket</groupId> <artifactId>javax.websocket-api</artifactId> - <version>1.1</version> + <version>${javax.websocket-api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${apache.httpclient.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${apache.httpclient.version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger2</artifactId> + <version>${springfox-swagger2.version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <version>${springfox-swagger-ui.version}</version> </dependency> - <!-- Kafka --> + <!-- Kafka --> <dependency> <groupId>org.springframework.kafka</groupId> @@ -103,31 +141,31 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.9.1</version> + <version>${assertj-core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.18.3</version> + <version>${mockito-core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>5.3.1</version> + <version>${junit-jupiter-engine.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> - <version>5.3.1</version> + <version>${junit-vintage-engine.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -145,49 +183,15 @@ <dependency> <groupId>org.bitbucket.radistao.test</groupId> <artifactId>before-after-spring-test-runner</artifactId> - <version>0.1.0</version> + <version>${before-after-spring-test-runner.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.palantir.docker.compose</groupId> <artifactId>docker-compose-rule-junit4</artifactId> - <version>0.29.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.6</version> + <version>${docker-compose-rule-junit4.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>4.5.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${apache.httpclient.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>${apache.httpclient.version}</version> - </dependency> - - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>2.9.2</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>2.9.2</version> - </dependency> - </dependencies> <build> @@ -230,7 +234,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.1.0</version> + <version>${build-helper-maven-plugin.version}</version> <executions> <execution> <id>add-integration-test-source-as-test-sources</id> diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml index 320805e..bae33f5 100644 --- a/pnfsimulator/pom.xml +++ b/pnfsimulator/pom.xml @@ -54,11 +54,42 @@ <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily> <onap.nexus.url>http://nexus3.onap.org</onap.nexus.url> + <spring-cloud-config-client.version>2.1.4.RELEASE</spring-cloud-config-client.version> + <logback-classic.version>1.2.3</logback-classic.version> + <logback-core.version>1.2.3</logback-core.version> + <slf4j-api.version>1.7.25</slf4j-api.version> + <commons-io.version>2.6</commons-io.version> + <json.version>20180130</json.version> + <gson.version>2.8.2</gson.version> + <httpclient.version>4.5.5</httpclient.version> + <guava.version>21.0</guava.version> + <commons-cli.version>1.4</commons-cli.version> + <commons-lang3.version>3.7</commons-lang3.version> + <lombok.version>1.18.2</lombok.version> + <jackson-datatype-jdk8.version>2.9.7</jackson-datatype-jdk8.version> + <jackson-datatype-jsr310.version>2.9.7</jackson-datatype-jsr310.version> + <vavr-match.version>0.9.2</vavr-match.version> + <vavr.version>0.9.2</vavr.version> + <assertj-core.version>3.9.1</assertj-core.version> + <mockito-core.version>2.18.3</mockito-core.version> + <spring-test.version>5.0.4.RELEASE</spring-test.version> + <springfox-swagger2.version>2.9.2</springfox-swagger2.version> + <springfox-swagger-ui.version>2.9.2</springfox-swagger-ui.version> + <quartz.version>2.2.1</quartz.version> + <quartz-jobs.version>2.2.1</quartz-jobs.version> + <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> + <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version> + <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version> + <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version> + <junit-platform-surefire-provider.version>1.1.1</junit-platform-surefire-provider.version> </properties> <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> + + <!-- Compile DEPENDENCIES --> + + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> <version>${spring.boot.version}</version> <exclusions> @@ -74,9 +105,9 @@ <version>${spring.boot.version}</version> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-mongodb</artifactId> - <version>${spring.boot.version}</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-mongodb</artifactId> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -86,87 +117,108 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-config-client</artifactId> - <version>2.1.4.RELEASE</version> + <version>${spring-cloud-config-client.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.2.3</version> + <version>${logback-classic.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>1.2.3</version> + <version>${logback-core.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> + <version>${slf4j-api.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.6</version> + <version>${commons-io.version}</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20180130</version> + <version>${json.version}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.2</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.5</version> + <version>${httpclient.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>21.0</version> + <version>${guava.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.4</version> + <version>${commons-cli.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.7</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.2</version> + <version>${lombok.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jdk8</artifactId> - <version>2.9.7</version> + <version>${jackson-datatype-jdk8.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> - <version>2.9.7</version> + <version>${jackson-datatype-jsr310.version}</version> </dependency> <dependency> - <groupId>io.vavr</groupId> - <artifactId>vavr-match</artifactId> - <version>0.9.2</version> + <groupId>io.vavr</groupId> + <artifactId>vavr-match</artifactId> + <version>${vavr-match.version}</version> + </dependency> + <dependency> + <groupId>io.vavr</groupId> + <artifactId>vavr</artifactId> + <version>${vavr.version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger2</artifactId> + <version>${springfox-swagger2.version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <version>${springfox-swagger-ui.version}</version> + </dependency> + <dependency> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz</artifactId> + <version>${quartz.version}</version> + </dependency> + <dependency> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz-jobs</artifactId> + <version>${quartz-jobs.version}</version> </dependency> - <dependency> - <groupId>io.vavr</groupId> - <artifactId>vavr</artifactId> - <version>0.9.2</version> - </dependency> + <!-- TEST DEPENDENCIES --> - <dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <version>${junit.jupiter.version}</version> @@ -181,19 +233,19 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.9.1</version> + <version>${assertj-core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.18.3</version> + <version>${mockito-core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>5.0.4.RELEASE</version> + <version>${spring-test.version}</version> <scope>test</scope> </dependency> <dependency> @@ -202,27 +254,7 @@ <version>${spring.boot.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>2.9.2</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>2.9.2</version> - </dependency> - <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz-jobs</artifactId> - <version>2.2.1</version> - </dependency> - </dependencies> + </dependencies> <build> <plugins> <plugin> @@ -244,7 +276,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>${maven.compiler.source}</source> <target>${maven.compiler.target}</target> @@ -255,7 +287,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>${maven-jar-plugin.version}</version> <configuration> <archive> <manifestEntries> @@ -268,7 +300,7 @@ <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> - <version>2.2.4</version> + <version>${git-commit-id-plugin.version}</version> <executions> <execution> <id>get-commit-info</id> @@ -285,12 +317,12 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19</version> + <version>${maven-surefire-plugin.version}</version> <dependencies> <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-surefire-provider</artifactId> - <version>1.1.1</version> + <version>${junit-platform-surefire-provider.version}</version> </dependency> </dependencies> <configuration> @@ -50,6 +50,8 @@ <docker-maven-plugin.version>0.31.0</docker-maven-plugin.version> <skipDockerPush>true</skipDockerPush> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version> + <docker-maven-plugin-io-fabric.version>0.31.0</docker-maven-plugin-io-fabric.version> </properties> <profiles> @@ -68,7 +70,7 @@ <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>${maven-checkstyle-plugin.version}</version> <configuration> <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> @@ -77,7 +79,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.31.0</version> + <version>${docker-maven-plugin-io-fabric.version}</version> </plugin> </plugins> </build> |