diff options
| author |   Michael Lando <ml636r@att.com> | 2017-06-09 12:20:38 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-06-09 12:20:38 +0300 |
| commit | b7bc7da72ae31e8549edb40eccccad298852de6e (patch) | |
| tree | ab5b0996345fda8b718ffd0a32083bb0a5141e74 | |
| parent | 41c9860e4a0be9e3453f9f9fa868a841eeaedb22 (diff) | |
[SDC-29] update pom for deployment and minor fix
Change-Id: I86052e9e060c4bfe6a8a807c6a93ac55bc6acaf6
Signed-off-by: Michael Lando <ml636r@att.com>
| -rw-r--r-- | catalog-be/pom.xml | 4 | ||||
| -rw-r--r-- | common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 17f01caa88..e53069cf5a 100644 --- 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 812b148984..b1f4117aaf 100644 --- 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"; |