diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-11-25 08:29:23 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-12-10 16:06:34 -0500 |
| commit | 7de29bfea89ff53a446bea07d8f74d1aaa87045b (patch) | |
| tree | 66f3824182cc91001e5540aa8ff545ed559f3a24 /plugins | |
| parent | be5662d19f464ab6e0c79c348e893a35ce780aea (diff) | |
Limit use of odlparent poms
Updated pom.xmls to use standard maven project structure (i.e. parent
of pom is pom in directory above), and updated top level pom to
use org.ccsdk.parent:oparent as parent - EXCEPT in cases where
module has true OpenDaylight dependencies and therefore needs
to use ODL parent pom.
Change-Id: I50429f28225152251ac2086235c14bb00f09c05c
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'plugins')
31 files changed, 91 insertions, 96 deletions
diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index c57b93800..2ce23f61d 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 5767bccc9..2f99aa6e5 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index a1e30a949..26632286e 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index 6566af7b8..03bb475b6 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index 1ebfa6d83..c3d742294 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 7533aa808..316a72b14 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 1ac638b54..bd0f16b57 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index 4deb5362c..45daca5a6 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index 848828b3c..a9fba195a 100644 --- a/plugins/features/features-sli-plugins/pom.xml +++ b/plugins/features/features-sli-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index 0ef6a107e..ce5f1ed58 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index a7c8ffa69..6e0f2227e 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -4,8 +4,8 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index b7a48e80f..2dbabd930 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>gr-toolkit</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index 1b3ce6802..50c75ac3d 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 8e264c476..7bb5e0485 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -3,10 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index 4a3654e09..3bdecd54f 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/pom.xml b/plugins/pom.xml index 11027f22a..79a508b45 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli</groupId> + <artifactId>sli-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>ccsdk-sli-plugins</artifactId> + <artifactId>plugins-root</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index a2f1a8522..8ffa0198c 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>properties-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index ae9b4d37b..c0600d31c 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index 30b00f762..ea2dddd16 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>properties-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 51f3a3d2f..fa3d93a6d 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>restapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index faac0884a..05ada5f3b 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 2e9152060..86e282361 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>restapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 5b9ff7555..9a85acb74 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>restconf-client</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index d3f833fd4..3b376562a 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index 0baac7d44..66d05de10 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -5,7 +5,8 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -32,6 +33,10 @@ <artifactId>jersey-media-sse</artifactId> </dependency> <dependency> + <groupId>org.glassfish.jersey.inject</groupId> + <artifactId>jersey-hk2</artifactId> + </dependency> + <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index a91212acd..d4b613ba2 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sshapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index d55046f3e..e3e714d9c 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 0717bd119..d48b4a97c 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sshapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index d3dc569df..42d295bd3 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>template-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 2dbbe5e70..cb0f48321 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 883ab7cbb..930afef7d 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>template-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> </dependency> </dependencies> </project> |