diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-01-29 12:46:06 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-01-29 12:47:35 -0500 |
| commit | 4e69f3358d31173a222b275e2a82da692846aa1a (patch) | |
| tree | 7355744a66614a0811113ee6a43a423e68257fe3 /sdnr/wt/data-provider/provider/pom.xml | |
| parent | 123b423cddbe01bdaba0bea50d986ff1b18a25bc (diff) | |
Revert "update common and data-provider"
This reverts commit a3e70a1a48d13193d9f28a2d91089d5b253d3e91.
Change was incomplete - many modules still reference version
2.1.0 (Sodium-based) of CCSDK parent poms, causing version
conflicts in odlsli docker.
Issue-ID: CCSDK-3076
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I447371239a1bfe102b705e7ecbd964f368780657
Diffstat (limited to 'sdnr/wt/data-provider/provider/pom.xml')
| -rw-r--r-- | sdnr/wt/data-provider/provider/pom.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml index 445c66daf..cb40f71cc 100644 --- a/sdnr/wt/data-provider/provider/pom.xml +++ b/sdnr/wt/data-provider/provider/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.0</version> <relativePath/> </parent> @@ -79,7 +79,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <artifactId>servlet-api</artifactId> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -92,11 +92,11 @@ <artifactId>org.apache.karaf.shell.core</artifactId> <scope>provided</scope> </dependency> -<!-- <dependency> --> -<!-- <groupId>org.apache.karaf.bundle</groupId> --> -<!-- <artifactId>org.apache.karaf.bundle.core</artifactId> --> -<!-- <scope>provided</scope> --> -<!-- </dependency> --> + <!-- <dependency> --> + <!-- <groupId>org.apache.karaf.bundle</groupId> --> + <!-- <artifactId>org.apache.karaf.bundle.core</artifactId> --> + <!-- <scope>provided</scope> --> + <!-- </dependency> --> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>sal-netconf-connector</artifactId> @@ -149,7 +149,7 @@ <goal>exec</goal> </goals> <configuration> - <executable>${basedir}/java.sh</executable> + <executable>java</executable> <arguments> <argument>-jar</argument> <argument>${basedir}/../../data-provider/setup/target/sdnr-dmt.jar</argument> |