diff options
author | Dan Timoney <dt5972@att.com> | 2018-06-18 17:56:02 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-06-18 17:56:02 +0000 |
commit | a2af7369129998533139d57f0f1a0757c7e13a10 (patch) | |
tree | 6f0ecea6b5cebf987d195f5a066d13eac909f743 /sli/common/pom.xml | |
parent | d2a764b04824233f2068460c3806016abf692b31 (diff) | |
parent | a7d1da3308031c3cce5e2e09b1f2727f1fceef02 (diff) |
Merge "Update sli/core to ODL Oxygen"
Diffstat (limited to 'sli/common/pom.xml')
-rwxr-xr-x | sli/common/pom.xml | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/sli/common/pom.xml b/sli/common/pom.xml index 7f5ac807..ebb4f095 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -24,50 +24,36 @@ </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>mdsal-artifacts</artifactId> - <version>1.6.1</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.11.1.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> - <version>${antlr.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.7.5</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> - </dependency> - <dependency> - <groupId>equinoxSDK381</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>${equinox.osgi.version}</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${osgi.core.version}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> @@ -128,7 +114,6 @@ <plugin> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> - <version>${antlr.version}</version> <executions> <execution> <configuration> |