diff options
| -rw-r--r-- | .idea/workspace.xml | 260 | ||||
| -rw-r--r-- | deliveries/os_build_febe.sh | 4 | ||||
| -rw-r--r-- | deliveries/os_docker_push.sh | 3 | ||||
| -rw-r--r-- | deliveries/os_docker_release.sh | 5 | ||||
| -rw-r--r-- | ecomp-portal-BE/pom.xml | 4 | ||||
| -rw-r--r-- | ecomp-portal-FE/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
7 files changed, 155 insertions, 125 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7ecb49f7..46611c3c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,9 @@ <component name="ChangeListManager"> <list default="true" id="9f8fedf4-4e3c-46d3-845e-c0f9aba359d6" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_build_febe.sh" afterPath="$PROJECT_DIR$/deliveries/os_build_febe.sh" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_docker_push.sh" afterPath="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_docker_release.sh" afterPath="$PROJECT_DIR$/deliveries/os_docker_release.sh" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ecomp-portal-BE/pom.xml" afterPath="$PROJECT_DIR$/ecomp-portal-BE/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ecomp-portal-FE/pom.xml" afterPath="$PROJECT_DIR$/ecomp-portal-FE/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> @@ -26,45 +29,45 @@ <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="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" /> + <state relative-caret-position="464"> + <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_docker_release.sh" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> + <file leaf-file-name="os_docker_push.sh" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="425"> - <caret line="25" column="24" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" /> + <state relative-caret-position="102"> + <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" /> <folding /> </state> </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_docker_release.sh" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> <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" /> + <state relative-caret-position="102"> + <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_settings.sh" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> + <file leaf-file-name="createMaria.sh" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/createMaria.sh"> <provider selected="true" editor-type-id="text-editor"> - <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" /> + <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="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"> + <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" /> @@ -73,18 +76,18 @@ </provider> </entry> </file> - <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"> + <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="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" /> + <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="version.properties" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/version.properties"> + <file leaf-file-name="my.cnf" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/my.cnf"> <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" /> @@ -93,31 +96,31 @@ </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <file leaf-file-name="new_start.sh" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/new_start.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="597"> - <caret line="49" column="29" lean-forward="false" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" /> + <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="pom.xml" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> + <file leaf-file-name="run.sh" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="272"> - <caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" /> + <state relative-caret-position="68"> + <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> + <file leaf-file-name="new_stop.sh" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/deliveries/new_stop.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="83" column="21" lean-forward="false" selection-start-line="83" selection-start-column="21" selection-end-line="83" selection-end-column="21" /> + <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> @@ -146,22 +149,22 @@ <list> <option value="$PROJECT_DIR$/deliveries/configure-and-run.sh" /> <option value="$PROJECT_DIR$/deliveries/run.sh" /> - <option value="$PROJECT_DIR$/deliveries/os_build_febe.sh" /> - <option value="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> - <option value="$PROJECT_DIR$/deliveries/os_docker_release.sh" /> <option value="$PROJECT_DIR$/deliveries/os_settings.sh" /> <option value="$PROJECT_DIR$/version.properties" /> - <option value="$PROJECT_DIR$/ecomp-portal-FE/pom.xml" /> <option value="$PROJECT_DIR$/ecomp-portal-BE/pom.xml" /> + <option value="$PROJECT_DIR$/ecomp-portal-FE/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> + <option value="$PROJECT_DIR$/deliveries/os_docker_release.sh" /> + <option value="$PROJECT_DIR$/deliveries/os_build_febe.sh" /> </list> </option> </component> <component name="ProjectFrameBounds"> <option name="x" value="-8" /> <option name="y" value="-8" /> - <option name="width" value="1936" /> - <option name="height" value="1056" /> + <option name="width" value="1616" /> + <option name="height" value="1176" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -220,6 +223,20 @@ <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="PackagesPane" /> @@ -464,8 +481,8 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> - <editor active="true" /> + <frame x="-8" y="-8" width="1616" height="1176" extended-state="6" /> + <editor active="false" /> <layout> <window_info id="Palette" 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="TODO" 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="6" side_tool="false" content_ui="tabs" /> @@ -479,10 +496,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="false" 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="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22818792" 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.32889125" 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.39652956" 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" /> @@ -510,45 +527,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="986"> - <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" /> - <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="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$/deliveries/createMaria.sh"> - <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$/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" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -593,6 +571,7 @@ <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> @@ -672,6 +651,7 @@ <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> @@ -787,14 +767,30 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> + <entry file="file://$PROJECT_DIR$/project.config" /> + <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="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" /> + <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> + <element signature="imports" expanded="false" /> + <element signature="e#206#207#0" expanded="false" /> + <element signature="e#279#280#0" expanded="false" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/createMaria.sh"> + <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> + <element signature="imports" expanded="false" /> + </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" /> @@ -802,11 +798,26 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/project.config" /> - <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> + <state relative-caret-position="-9728"> + <caret line="12" column="38" lean-forward="false" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-1126"> + <caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="119"> + <caret line="7" column="27" lean-forward="false" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" /> <folding /> </state> </provider> @@ -815,26 +826,27 @@ <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$/deliveries/os_docker_push.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="136"> - <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> + <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> - <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/Dockerfile.mariadb"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="425"> - <caret line="25" column="24" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" /> + <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$/deliveries/os_Dockerfile"> + <entry file="file://$PROJECT_DIR$/deliveries/dbstart.sh"> <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" /> @@ -842,23 +854,23 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/createMaria.sh"> <provider selected="true" editor-type-id="text-editor"> - <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" /> + <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$/deliveries/os_settings.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/my.cnf"> <provider selected="true" editor-type-id="text-editor"> - <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" /> + <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/utils/EcompPortalUtilsTest.java"> + <entry file="file://$PROJECT_DIR$/deliveries/new_start.sh"> <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" /> @@ -866,7 +878,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/src/test/java/org/openecomp/portalapp/portal/listener/HealthMonitorTest.java"> + <entry file="file://$PROJECT_DIR$/deliveries/new_stop.sh"> <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" /> @@ -874,7 +886,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/version.properties"> + <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" /> @@ -882,26 +894,42 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> + <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="272"> - <caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" /> + <state relative-caret-position="68"> + <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> + <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="83" column="21" lean-forward="false" selection-start-line="83" selection-start-column="21" selection-end-line="83" selection-end-column="21" /> + <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$/pom.xml"> + <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="464"> + <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" /> + <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="102"> + <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" /> + <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="597"> - <caret line="49" column="29" lean-forward="false" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" /> + <state relative-caret-position="102"> + <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" /> <folding /> </state> </provider> diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh index 4497befa..e2ee906c 100644 --- a/deliveries/os_build_febe.sh +++ b/deliveries/os_build_febe.sh @@ -41,7 +41,7 @@ cd $PROJECTDIR/ecomp-sdk/sdk-app ${MVN} install -mv target/ep-sdk-app-1.0.0 target/ep-sdk-app +mv target/ep-sdk-app-1.1.0-SNAPSHOT target/ep-sdk-app # now install DBC app cd $SOURCEDIR @@ -59,7 +59,7 @@ cd $DBCDIR/dcae_dmaapbc_webapp ${MVN} install cd target -mv dmaap-bc-app.1.0.0.0 ep-dbc-app +mv dmaap-bc-app.1.1.0-SNAPSHOT.0 ep-dbc-app # install into docker diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh index 165d05d6..fe422f32 100644 --- a/deliveries/os_docker_push.sh +++ b/deliveries/os_docker_push.sh @@ -4,7 +4,8 @@ REPO="nexus3.openecomp.org:10003" -VERSION="1.0.0" +TIMESTAMP=$(date +%C%y%m%dT%H%M%S) +VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}" LATEST="latest" APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}" diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh index 95b1c80b..fc721c2f 100644 --- a/deliveries/os_docker_release.sh +++ b/deliveries/os_docker_release.sh @@ -2,9 +2,10 @@ ./run.sh -REPO="nexus3.openecomp.org:10002" +REPO="nexus3.openecomp.org:10003" -VERSION="1.0.0" +TIMESTAMP=$(date +%C%y%m%dT%H%M%S) +VERSION="1.1.0-STAGING-${TIMESTAMP}" LATEST="latest" APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}" diff --git a/ecomp-portal-BE/pom.xml b/ecomp-portal-BE/pom.xml index cdb4a5c4..126f0e44 100644 --- a/ecomp-portal-BE/pom.xml +++ b/ecomp-portal-BE/pom.xml @@ -4,13 +4,13 @@ <groupId>org.openecomp.portal</groupId> <artifactId>ecompportal</artifactId> <packaging>war</packaging> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <properties> <springframework.version>4.2.0.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> <eelf.version>0.0.1</eelf.version> - <projectversion>1.0.0</projectversion> + <projectversion>1.1.0-SNAPSHOT</projectversion> <encoding>UTF-8</encoding> <!-- Tests usually require some setup that maven cannot do, so skip. --> <skiptests>false</skiptests> diff --git a/ecomp-portal-FE/pom.xml b/ecomp-portal-FE/pom.xml index 97283c0a..30f136eb 100644 --- a/ecomp-portal-FE/pom.xml +++ b/ecomp-portal-FE/pom.xml @@ -3,7 +3,7 @@ <groupId>org.openecomp.portal</groupId> <artifactId>ecomp-portal-FE</artifactId> <!-- Jenkins build process will append build number --> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <build> <plugins> @@ -5,7 +5,7 @@ <artifactId>portal-project</artifactId> <packaging>pom</packaging> <!-- NOTE This value will not be picked from the property tag below, pass it as -Drelease.version="" when doing mvn deploy --> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> <name>Portal (parent)</name> <url>https://wiki/display/EcompPortal</url> <description>ECOMP Portal Open-Source</description> |