diff options
author | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-15 16:13:55 -0400 |
---|---|---|
committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-15 16:13:55 -0400 |
commit | a7d1da3308031c3cce5e2e09b1f2727f1fceef02 (patch) | |
tree | 2a507f625b889293f11ab01e642104a34b6bbb3a /sli/common | |
parent | 1a71779b7b1104ba6d5e289e6dc839bb4b9493d5 (diff) |
Update sli/core to ODL Oxygen
Update sli/core artifacts to compile cleanly against ODL Oxygen
version of CCSDK parent poms.
Change-Id: I9f3b4c40b1ae62cdda1c35836466f8faf7da3b39
Issue-ID: CCSDK-280
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'sli/common')
-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> |