summaryrefslogtreecommitdiffstats
path: root/odlparent/setup
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-11 11:08:07 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-11 11:08:07 -0500
commitc04206a0d20db82417ebe9ede37441c6d9681cd3 (patch)
tree41b032c7a06ece4d5b824dd2d5444400c25cb2f0 /odlparent/setup
parent79ddeb64d15861ad52d6f31d52fd7c61b9c2ade3 (diff)
Break dependency loop
Removed import of CCSDK repo artifact BOMs from parent poms to break a dependency loop. Including those meant that, when rolling to a new release version, we'd have to touch parent twice: first, with the 'old' version of CCDSK repos (since they're not built yet), and then after they're built, we'd have to update parent poms to import the rolled-version of the repo BOMs. And after that, we'd need to re-merge all the repos, so that they are compiled against the correct version of sli core. Change-Id: Id10c29e3f321defb1b911de894cf045693ef90cc Issue-ID: CCSDK-939 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlparent/setup')
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml39
1 files changed, 5 insertions, 34 deletions
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index adc24ab4..cc038a89 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -93,11 +93,11 @@
<!-- CCSDK component versions -->
- <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.core.version>0.4.1-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.4.1-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.4.1-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.4.1-SNAPSHOT</ccsdk.sli.plugins.version>
+ <ccsdk.distribution.version>0.4.1-SNAPSHOT</ccsdk.distribution.version>
<sdnctl.sli.version>\${ccsdk.sli.core.version}</sdnctl.sli.version>
<sdnctl.aai.service.version>\${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
<sdnctl.dblib.version>\${ccsdk.sli.core.version}</sdnctl.dblib.version>
@@ -532,35 +532,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-core-artifacts</artifactId>
- <version>\${ccsdk.sli.core.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>sli-adaptors-artifacts</artifactId>
- <version>\${ccsdk.sli.adaptors.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>sli-northbound-artifacts</artifactId>
- <version>\${ccsdk.sli.northbound.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>sli-plugins-artifacts</artifactId>
- <version>\${ccsdk.sli.plugins.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
<dependency>
<groupId>org.opendaylight.controller</groupId>