diff options
| -rw-r--r-- | .idea/workspace.xml | 198 | ||||
| -rw-r--r-- | version.properties | 13 |
2 files changed, 77 insertions, 134 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d60d8f17..f3610178 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="9f8fedf4-4e3c-46d3-845e-c0f9aba359d6" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_settings.sh" afterPath="$PROJECT_DIR$/deliveries/os_settings.sh" /> - </list> + <list default="true" id="9f8fedf4-4e3c-46d3-845e-c0f9aba359d6" name="Default" comment="" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -20,20 +18,10 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="configure-and-run.sh" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="17"> - <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="os_build_febe.sh" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="688"> + <state relative-caret-position="901"> <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <folding /> </state> @@ -60,8 +48,8 @@ </provider> </entry> </file> - <file leaf-file-name="createMaria.sh" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deliveries/createMaria.sh"> + <file leaf-file-name="os_Dockerfile" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/os_Dockerfile"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -70,21 +58,41 @@ </provider> </entry> </file> - <file leaf-file-name="os_Dockerfile" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deliveries/os_Dockerfile"> + <file leaf-file-name="os_settings.sh" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-306"> + <state relative-caret-position="187"> + <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="EcompPortalUtilsTest.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/src/test/java/org/openecomp/portalapp/portal/utils/EcompPortalUtilsTest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_settings.sh" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> + <file leaf-file-name="HealthMonitorTest.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/src/test/java/org/openecomp/portalapp/portal/listener/HealthMonitorTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="153"> - <caret line="9" column="83" lean-forward="false" selection-start-line="9" selection-start-column="83" selection-end-line="9" selection-end-column="83" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="version.properties" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/version.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> @@ -110,16 +118,6 @@ </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindInProjectRecents"> @@ -173,8 +171,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="Scratches" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -187,73 +185,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ecomp-portal-FE" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ecomp-portal-BE" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ecomp-portal-BE" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ecomp-portal-resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sql scripts" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="deliveries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </pane> - <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -261,8 +195,8 @@ </component> <component name="RecentsManager"> <key name="CopyFile.RECENT_KEYS"> - <recent name="C:\Users\talasila\OpenECOMP\portal\deliveries" /> <recent name="C:\Users\talasila\OpenECOMP\portal" /> + <recent name="C:\Users\talasila\OpenECOMP\portal\deliveries" /> <recent name="C:\Users\talasila\OpenECOMP\portal\ecomp-portal-FE" /> </key> </component> @@ -510,10 +444,10 @@ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29144096" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25785482" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26599148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32889125" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="BPMNPalette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -541,35 +475,10 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="221"> - <caret line="13" column="89" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="89" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="136"> - <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="425"> - <caret line="25" column="24" lean-forward="true" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -649,7 +558,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -729,7 +637,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -865,7 +772,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -919,7 +825,7 @@ </entry> <entry file="file://$PROJECT_DIR$/deliveries/os_Dockerfile"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-306"> + <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> @@ -927,7 +833,7 @@ </entry> <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="688"> + <state relative-caret-position="901"> <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <folding /> </state> @@ -935,8 +841,32 @@ </entry> <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="153"> - <caret line="9" column="83" lean-forward="false" selection-start-line="9" selection-start-column="83" selection-end-line="9" selection-end-column="83" /> + <state relative-caret-position="187"> + <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/src/test/java/org/openecomp/portalapp/portal/utils/EcompPortalUtilsTest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/src/test/java/org/openecomp/portalapp/portal/listener/HealthMonitorTest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/version.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> diff --git a/version.properties b/version.properties new file mode 100644 index 00000000..51287873 --- /dev/null +++ b/version.properties @@ -0,0 +1,13 @@ +# 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 + +major=1 +minor=0 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT |