diff options
author | Dan Timoney <dtimoney@att.com> | 2020-12-09 07:37:08 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2020-12-09 07:37:08 -0500 |
commit | 161996dd93c63db0f8cd0e72f871431e67270b00 (patch) | |
tree | b3172aa5131ba84c2b18fc7831703ad5e7cccdeb /oparent | |
parent | a265d5be417269a7814e2e71e7dad7c0719f4770 (diff) |
Updates to support use of oparent in non-ODL dependent code
Added missing dependencies needed in oparent and dependencies-bom
to allow oparent pom to be used in ccsdk/sli for code not
directly dependent on OpenDaylight. Also, updated to latest
springboot release and to latest released version of ONAP oparent
pom. Note: this change does NOT address changes to compile jars as
java 11. That change will come with the changes for ODL Aluminum.
Change-Id: I599bae0c32f5ced7eada956a0ed3b57f40461cd5
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'oparent')
-rwxr-xr-x | oparent/pom.xml | 51 |
1 files changed, 48 insertions, 3 deletions
diff --git a/oparent/pom.xml b/oparent/pom.xml index 998c0956..6ca7c830 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -55,9 +55,13 @@ <bundle.plugin.version>2.5.0</bundle.plugin.version> <checkstyle.skip>true</checkstyle.skip> + <mariadb.connector.version>2.1.1</mariadb.connector.version> + <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version> + <velocity.version>2.0</velocity.version> + <dmaap.listener.version>1.1.5</dmaap.listener.version> - <sdc.client.version>1.4.0</sdc.client.version> - <sdc.tosca.version>1.6.3</sdc.tosca.version> + <sdc.client.version>1.4.1</sdc.client.version> + <sdc.tosca.version>1.6.5</sdc.tosca.version> </properties> @@ -71,6 +75,14 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>2.3.5.RELEASE</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> <version>${sdc.client.version}</version> @@ -93,10 +105,38 @@ <dependencies> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>provided</scope> - </dependency> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.11</version> + <scope>test</scope> + </dependency> </dependencies> <repositories> @@ -154,6 +194,11 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.2.0</version> + </plugin> + <plugin> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> <version>4.7.2</version> |