diff options
| author |   Michael Lando <ml636r@att.com> | 2017-06-09 04:54:54 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-06-09 04:54:54 +0300 |
| commit | 61f98d435914d20d0559ddfcd336020dc9dfc473 (patch) | |
| tree | caa63a2cd04c4cdfd5148d1a9b1cc59d0f9cc952 /openecomp-be/lib/openecomp-sdc-model-lib | |
| parent | ed64b5edff15e702493df21aa3230b81593e6133 (diff) | |
[SDC-29] catalog 1707 rebase commit pom fix.
Change-Id: I587658ad29bbbe79ad97ba30e2499c7a723201ce
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-model-lib')
7 files changed, 6 insertions, 206 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml index 562a0f4a1a..a1b2b85d76 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml @@ -16,7 +16,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.core</groupId> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-facade-core</artifactId> <version>${project.version}</version> </dependency> @@ -36,12 +36,12 @@ <version>${swagger.version}</version> </dependency> <dependency> - <groupId>org.openecomp.core</groupId> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-heat-lib</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.core</groupId> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-tosca-lib</artifactId> <version>${project.version}</version> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml.versionsBackup b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml.versionsBackup deleted file mode 100644 index eba0f207e4..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>openecomp-sdc-model-api</name> - <artifactId>openecomp-sdc-model-api</artifactId> - - - <parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-lib</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../..</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>org.openecomp.core</groupId> - <artifactId>openecomp-facade-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-validation-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-versioning-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - <version>1.5.3</version> - </dependency> - <dependency> - <groupId>org.openecomp.core</groupId> - <artifactId>openecomp-heat-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.core</groupId> - <artifactId>openecomp-tosca-lib</artifactId> - <version>${project.version}</version> - </dependency> - - </dependencies> - -</project>
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml index e1fb942102..c63a0d0606 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml @@ -21,7 +21,7 @@ <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.openecomp.core</groupId> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-utilities-lib</artifactId> <version>${project.version}</version> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml.versionsBackup b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml.versionsBackup deleted file mode 100644 index d62437122a..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml.versionsBackup +++ /dev/null @@ -1,56 +0,0 @@ -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>openecomp-sdc-model-core</name> - <artifactId>openecomp-sdc-model-core</artifactId> - - - <parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-lib</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../..</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - - </dependency> - - - <dependency> - <groupId>org.openecomp.core</groupId> - <artifactId>openecomp-utilities-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-model-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-versioning-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-datatypes-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.10.19</version> - </dependency> - - - </dependencies> -</project>
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml index d08ac46973..a3b1e0db9f 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml @@ -21,7 +21,7 @@ <version>${logback.version}</version> </dependency> <dependency> - <groupId>org.openecomp.core</groupId> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-utilities-lib</artifactId> <version>${project.version}</version> </dependency> @@ -31,7 +31,7 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.core</groupId> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-zusammen-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml.versionsBackup b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml.versionsBackup deleted file mode 100644 index b8db689bd5..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml.versionsBackup +++ /dev/null @@ -1,49 +0,0 @@ -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>openecomp-sdc-model-impl</name> - <artifactId>openecomp-sdc-model-impl</artifactId> - - - <parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-lib</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../..</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.core</groupId> - <artifactId>openecomp-utilities-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-model-core</artifactId> - <version>${project.version}</version> - </dependency> - - - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-datatypes-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.10.19</version> - </dependency> - - - </dependencies> -</project>
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml.versionsBackup b/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml.versionsBackup deleted file mode 100644 index d49cbd7069..0000000000 --- a/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml.versionsBackup +++ /dev/null @@ -1,44 +0,0 @@ -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>openecomp-sdc-model-lib</name> - <artifactId>openecomp-sdc-model-lib</artifactId> - - <packaging>pom</packaging> - <parent> - <artifactId>openecomp-sdc-lib</artifactId> - <groupId>org.openecomp.sdc</groupId> - <version>1.0-SNAPSHOT</version> - </parent> - - <modules> - <module>openecomp-sdc-model-api</module> - <module>openecomp-sdc-model-core</module> - <module>openecomp-sdc-model-impl</module> - </modules> - - <dependencies> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-model-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-model-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-model-impl</artifactId> - <version>${project.version}</version> - </dependency> - <!--dependency> - <groupId>org.openecomp.core</groupId> - <artifactId>openecomp-common-lib</artifactId> - <version>${project.version}</version> - </dependency--> - </dependencies> -</project>
\ No newline at end of file |