diff options
Diffstat (limited to 'appc-directed-graph')
| -rw-r--r-- | appc-directed-graph/appc-dgraph/pom.xml | 5 | ||||
| -rw-r--r-- | appc-directed-graph/dg-loader/features/pom.xml | 3 | ||||
| -rw-r--r-- | appc-directed-graph/dg-loader/features/src/main/resources/features.xml | 4 | ||||
| -rw-r--r-- | appc-directed-graph/dg-loader/pom.xml | 5 | ||||
| -rw-r--r-- | appc-directed-graph/pom.xml | 6 |
5 files changed, 3 insertions, 20 deletions
diff --git a/appc-directed-graph/appc-dgraph/pom.xml b/appc-directed-graph/appc-dgraph/pom.xml index 68a06225c..e35d5cc0d 100644 --- a/appc-directed-graph/appc-dgraph/pom.xml +++ b/appc-directed-graph/appc-dgraph/pom.xml @@ -43,11 +43,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version> - <odl.controller.mdsal.version>1.4.1-Boron-SR1</odl.controller.mdsal.version> - <openecomp.sdnc.sli.version>1.1.0</openecomp.sdnc.sli.version> - <openecomp.sdnc.dblib.version>1.1.0</openecomp.sdnc.dblib.version> - <openecomp.sdnc.sql-resource.version>1.1.0</openecomp.sdnc.sql-resource.version> <licenseDir>${project.parent.parent.basedir}</licenseDir> </properties> diff --git a/appc-directed-graph/dg-loader/features/pom.xml b/appc-directed-graph/dg-loader/features/pom.xml index aec188e84..06c8c3ad0 100644 --- a/appc-directed-graph/dg-loader/features/pom.xml +++ b/appc-directed-graph/dg-loader/features/pom.xml @@ -22,14 +22,12 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>features-mdsal</artifactId> - <version>${odl.mdsal.version}</version> <classifier>features</classifier> <type>xml</type> @@ -41,7 +39,6 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>opendaylight-karaf-empty</artifactId> - <version>${odl.karaf.empty.distro.version}</version> <type>zip</type> </dependency> diff --git a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml index 49bf35811..e35943af5 100644 --- a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml +++ b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml @@ -29,8 +29,8 @@ <feature name='sdnc-dg-loader' description="SDNC DG Loader" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature> - <feature version='${openecomp.sdnc.sli.version}'>sdnc-sli</feature> + <feature>odl-mdsal-broker</feature> + <feature>sdnc-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml index 1d5962909..65659297b 100644 --- a/appc-directed-graph/dg-loader/pom.xml +++ b/appc-directed-graph/dg-loader/pom.xml @@ -45,15 +45,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version.source>1.8</java.version.source> <java.version.target>1.8</java.version.target> - <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version> - <odl.controller.mdsal.version>1.4.1-Boron-SR1</odl.controller.mdsal.version> <logback.version>1.1.1</logback.version> <common.collections.version>3.2.1</common.collections.version> <common.io.version>2.5</common.io.version> <jettison.version>1.3.7</jettison.version> - <openecomp.sdnc.sli.version>1.1.0</openecomp.sdnc.sli.version> - <openecomp.sdnc.dblib.version>1.1.0</openecomp.sdnc.dblib.version> - <openecomp.sdnc.sql-resource.version>1.1.0</openecomp.sdnc.sql-resource.version> <licenseDir>${project.parent.parent.basedir}</licenseDir> </properties> diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml index 16970b4ac..1955f04d4 100644 --- a/appc-directed-graph/pom.xml +++ b/appc-directed-graph/pom.xml @@ -39,16 +39,12 @@ <description>Application Controller Directed Graph</description> <properties> - <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version> <jackson.version>2.3.2</jackson.version> <snakeyaml.version>1.12</snakeyaml.version> <velocity.version>1.7</velocity.version> <jettison.version>1.3.7</jettison.version> <common.collections.version>3.2.1</common.collections.version> <common.io.version>2.5</common.io.version> - <sdnc.sql.resource.version>1.1.0</sdnc.sql.resource.version> - <openecomp.sdnc.sql-resource.version>1.1.0</openecomp.sdnc.sql-resource.version> - <sdnc.sli.version>1.1.0</sdnc.sli.version> <tosca.datatype.version>1.1.0</tosca.datatype.version> <licenseDir>${project.parent.basedir}</licenseDir> </properties> @@ -59,7 +55,7 @@ <dependency> <groupId>org.openecomp.sdnc.adaptors</groupId> <artifactId>sql-resource-provider</artifactId> - <version>${openecomp.sdnc.sql-resource.version}</version> + <version>${ccsdk.sli.adaptors.version}</version> </dependency> <dependency> |