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/common/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/common/pom.xml')
| -rw-r--r-- | sdnr/wt/common/pom.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml index 83b07536f..54ffc01c3 100644 --- a/sdnr/wt/common/pom.xml +++ b/sdnr/wt/common/pom.xml @@ -29,14 +29,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.0</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-common</artifactId> <version>1.1.1-SNAPSHOT</version> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>ccsdk-features :: ${project.artifactId}</name> <licenses> @@ -47,6 +47,7 @@ </licenses> <properties> + <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration --> <maven.javadoc.skip>true</maven.javadoc.skip> <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format> <buildtime>${maven.build.timestamp} UTC</buildtime> @@ -62,7 +63,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <artifactId>servlet-api</artifactId> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -76,6 +77,7 @@ <dependency> <groupId>org.elasticsearch.client</groupId> <artifactId>elasticsearch-rest-client</artifactId> + <version>${elasticsearch-rest-client.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -90,8 +92,8 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> </dependency> </dependencies> @@ -112,6 +114,7 @@ <plugin> <groupId>com.github.alexcojocaru</groupId> <artifactId>elasticsearch-maven-plugin</artifactId> + <version>6.16</version> <configuration> <skip>${skipTests}</skip> <clusterName>testCluster</clusterName> |