[SDC-29] update pom for deployment and minor fix

Change-Id: I86052e9e060c4bfe6a8a807c6a93ac55bc6acaf6
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 17f01ca..e53069c 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -596,7 +596,7 @@
                                                WEB-INF/classes/portal.properties</packagingExcludes>
                                        <archive>
                                                <manifestEntries>
-                                                       <SDC-Version>${full.release.version}</SDC-Version>
+                                                       <SDC-Version>${project.version}</SDC-Version>
                                                </manifestEntries>
                                                <manifest>
                                                        <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -738,7 +738,7 @@
                                                        <goal>copy-resources</goal>
                                                </goals>
                                                <configuration>
-                                                       <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-normatives/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
+                                                       <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
                                                        <resources>
                                                                <resource>
                                                                        <directory>./target</directory>

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java
index 812b148..b1f4117 100644 (file)
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java
@@ -62,7 +62,7 @@ public interface Constants {
        public static final String SERVICE_ARTIFACT_ID_FORMAT = "%s:%s:%s:%s"; // serviceName:serviceVersion:nodeTemplateName:artifactName
        public static final String CONTENT_DISPOSITION = "content-disposition";
        public static final String DOWNLOAD_ARTIFACT_LOGIC_ATTR = "downloadArtifactLogic";
-       public static final String ASDC_RELEASE_VERSION_ATTR = "ASDC-Version";
+       public static final String ASDC_RELEASE_VERSION_ATTR = "SDC-Version";
        // public static final String AUDITING_MANAGER = "auditingManager";
        // public static final String USER_ADMIN_MANAGER = "userAdminManager";
        public static final String YEAR = "year";