diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-11-25 08:23:08 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-12-07 12:36:35 -0500 |
| commit | a265d5be417269a7814e2e71e7dad7c0719f4770 (patch) | |
| tree | 2d8c08f9718454b3dbad23f6f7a4f3da425f44ce /oparent | |
| parent | b044ec87f782ed741c814311e64664f0b64aa255 (diff) | |
Add missing dependencies to ccsdk oparent and fix versions
Some version declarations were missing from CCSDK oparent, which
causes problems when moving repos to use CCSDK oparent pom instead
of ODL-based parents. Also, update version properies to latest CCSDK
master snapshot versions.
Change-Id: Ia9222da0f8720f981cfcd98aaeaafc68aedbcb92
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'oparent')
| -rwxr-xr-x | oparent/pom.xml | 120 |
1 files changed, 38 insertions, 82 deletions
diff --git a/oparent/pom.xml b/oparent/pom.xml index d96f5e12..998c0956 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>3.1.0</version> <relativePath/> </parent> @@ -55,26 +55,10 @@ <bundle.plugin.version>2.5.0</bundle.plugin.version> <checkstyle.skip>true</checkstyle.skip> - <!-- CCSDK component versions --> - <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version> - <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version> - <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version> - <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version> - <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version> - - - <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> - <dependency-list.file>direct-dependencies.txt</dependency-list.file> - </properties> <dependencyManagement> @@ -103,63 +87,18 @@ <artifactId>dmaapClient</artifactId> <version>${dmaap.listener.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.21</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>2.11.2</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> - <version>${velocity.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <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> - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.2.3</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <repositories> <repository> <id>onap-public</id> @@ -215,17 +154,9 @@ <pluginManagement> <plugins> <plugin> - <groupId>com.github.ferstl</groupId> - <artifactId>depgraph-maven-plugin</artifactId> - <version>3.3.0</version> - <configuration> - <graphFormat>text</graphFormat> - <outputFileName>${dependency-list.file}</outputFileName> - <outputDirectory>${project.basedir}</outputDirectory> - <transitiveExcludes>*</transitiveExcludes> - <showVersions>true</showVersions> - <showGroupIds>true</showGroupIds> - </configuration> + <groupId>org.antlr</groupId> + <artifactId>antlr4-maven-plugin</artifactId> + <version>4.7.2</version> </plugin> </plugins> </pluginManagement> @@ -342,6 +273,31 @@ <version>4.2.1</version> <extensions>true</extensions> </plugin> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>manifest</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + <ignore /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> </plugins> </build> |