Merge branch 'master' of /home/jwagantall/linuxfoundation/onap/IT-21112/sli-adaptors
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
diff --git a/INFO.yaml b/INFO.yaml
index 65a9802..804281b 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -1,5 +1,5 @@
---
-project: 'ccsdk-sli-adaptors'
+project: 'ccsdk-sli'
project_creation_date: '2017-06-27'
lifecycle_state: 'Mature'
project_category: ''
@@ -29,11 +29,6 @@
time: '13:00 UTC'
committers:
- <<: *onap_releng_ptl
- - name: 'Jack Lucas'
- email: 'jflucas@research.att.com'
- company: 'ATT'
- id: 'jackl'
- timezone: 'America/New_York'
- name: 'Jun (Nicolas) Hu'
email: 'jh245g@att.com'
company: 'ATT'
@@ -65,7 +60,7 @@
id: 'ks220y'
timezone: 'America/New_York'
repositories:
- - ccsdk/sli/adaptors
+ - ccsdk/sli
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
changes:
diff --git a/pom.xml b/pom.xml
index da27695..1c9b9c8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,154 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
- </parent>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>ccsdk-sli-adaptors</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.onap.ccsdk.sli</groupId>
+ <artifactId>ccsdk-sli</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>ccsdk-sli-adaptors</name>
- <description>The CCSDK core components contains the SLI, dblib and root pom</description>
- <url>https://wiki.onap.org</url>
- <organization>
- <name>ONAP</name>
- </organization>
+ <name>ccsdk-sli</name>
+ <description>Service Logic Interpreter</description>
+ <url>https://wiki.onap.org</url>
+ <organization>
+ <name>ONAP</name>
+ </organization>
- <modules>
- <module>aai-service</module>
- <module>ansible-adapter</module>
- <module>saltstack-adapter</module>
- <module>netbox-client</module>
- <module>mdsal-resource</module>
- <module>resource-assignment</module>
- <module>sql-resource</module>
- <module>base</module>
- <module>message-router</module>
- <module>features</module>
- <module>artifacts</module>
- </modules>
+ <modules>
+ </modules>
- <scm>
- <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors</connection>
- <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/ccsdk/sli/adaptors</developerConnection>
- <url>${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors</url>
- <tag>ccsdk-adaptors-${project.version}</tag>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>https://jira.onap.org/</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://jenkins.onap.org/</url>
- </ciManagement>
- <distributionManagement>
- <site>
- <id>sdnc-javadoc</id>
- <url>
- dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version}
- </url>
- </site>
- </distributionManagement>
+ <scm>
+ <connection>scm:git:ssh://git@${onap.git.host}/sdnc-code.git</connection>
+ <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sli.git</developerConnection>
+ <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sli/browse</url>
+ <tag>sli-1.1.0</tag>
+ </scm>
+ <distributionManagement>
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${onap.nexus.url}/${sitePath}</url>
+ </site>
+ </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <sitePath>content/sites/site/org/onap/ccsdk/sli/${project.version}/</sitePath>
+ </properties>
- <profiles>
- <profile>
- <id>blackduck</id>
- <activation>
- <property>
- <name>blackduck-scan</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <profiles>
+ <profile>
+ <id>blackduck</id>
+ <activation>
+ <property>
+ <name>blackduck-scan</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.blackducksoftware.integration</groupId>
+ <artifactId>hub-maven-plugin</artifactId>
+ <version>1.4.0</version>
+ <inherited>false</inherited>
+ <configuration>
+ <hubProjectName>${project.name}</hubProjectName>
+ <outputDirectory>${project.basedir}</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-bdio-file</id>
+ <phase>package</phase>
+ <goals>
+ <goal>createHubOutput</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </build>
+ <profile>
+ <id>dependency-list</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.ferstl</groupId>
+ <artifactId>depgraph-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${dependency-list.file}</file>
+ <type>txt</type>
+ <classifier>dependencies</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </profile>
-
- <profile>
- <id>dependency-list</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.ferstl</groupId>
- <artifactId>depgraph-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <inherited>false</inherited>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <inherited>false</inherited>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${dependency-list.file}</file>
- <type>txt</type>
- <classifier>dependencies</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
+ </profiles>
</project>
diff --git a/version.properties b/version.properties
index 8c04384..977efc0 100644
--- a/version.properties
+++ b/version.properties
@@ -2,13 +2,3 @@
# Versioning variables
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-
-release_name=1
-sprint_number=1
-feature_revision=1
-
-base_version=${release_name}.${sprint_number}.${feature_revision}
-
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
-