diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-04-16 14:17:52 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-04-19 21:37:15 +0000 |
| commit | e3c3eb5012b02d87a8d7143be3c195e86c298461 (patch) | |
| tree | 349ac19ea8f8682fc48df58a54f084c237061980 /dcae-controller-core/dcae-controller-operation-utils | |
| parent | 1650c3b0dda805110cac90dcaab8288d6b607b43 (diff) | |
[DCAE-15] Changes related to version 1.1
See Jira for details
Change-Id: I29280abce45f53e80adf675f48cf1e0fff9e2c0a
Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'dcae-controller-core/dcae-controller-operation-utils')
4 files changed, 9 insertions, 8 deletions
diff --git a/dcae-controller-core/dcae-controller-operation-utils/.classpath b/dcae-controller-core/dcae-controller-operation-utils/.classpath index b14f8a5..af62a1c 100644 --- a/dcae-controller-core/dcae-controller-operation-utils/.classpath +++ b/dcae-controller-core/dcae-controller-operation-utils/.classpath @@ -12,7 +12,6 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" path="config"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"> <attributes> <attribute name="maven.pomderived" value="true"/> @@ -24,7 +23,6 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs b/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF b/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF index a0c1ab8..ed5086e 100644 --- a/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF +++ b/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF @@ -4,9 +4,4 @@ Bundle-Name: dcae-controller-operation-utils Bundle-SymbolicName: dcae-controller-operation-utils Bundle-Version: 1.0.0.qualifier Export-Package: org.openecomp.dcae.controller.operation.utils -Require-Bundle: dcae-controller-service-vm-model;bundle-version="0.1.0", - dcae-controller-service-vm-adaptor;bundle-version="0.1.0", - dcae-controller-platform-model;bundle-version="0.1.0", - ncomp-sirius-manager-console;bundle-version="0.1.0", - ncomp-sirius-manager-server;bundle-version="0.1.0", - dcae-controller-core-model;bundle-version="0.1.0" + diff --git a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy index 38f48b0..c007a68 100644 --- a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy +++ b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy @@ -336,6 +336,12 @@ class GenControllerConfiguration extends DocUtils { } save("/databus",[streams : platformConfig.streams2bus()]) save("/cluster",platformConfig.controllerCluster()) + // version + def version = file2object("$release/version.yaml", false) + System.err.println "version=$version" + if (version != null) { + save("/configuration/version",version) + } } void createLocations() { |