diff options
| -rw-r--r-- | .idea/workspace.xml | 127 | ||||
| -rw-r--r-- | ecomp-portal-BE/pom.xml | 8 | ||||
| -rw-r--r-- | ecomp-portal-FE/pom.xml | 8 | ||||
| -rw-r--r-- | pom.xml | 30 |
4 files changed, 127 insertions, 46 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f3610178..7ecb49f7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,12 @@ <?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="" /> + <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$/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" /> + </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -28,16 +33,6 @@ </provider> </entry> </file> - <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="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" /> - <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"> <provider selected="true" editor-type-id="text-editor"> @@ -88,7 +83,7 @@ </provider> </entry> </file> - <file leaf-file-name="version.properties" pinned="false" current-in-tab="true"> + <file leaf-file-name="version.properties" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/version.properties"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -98,11 +93,11 @@ </provider> </entry> </file> - <file leaf-file-name="run.sh" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/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="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" /> <folding /> </state> </provider> @@ -111,8 +106,18 @@ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <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" /> + <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" /> + <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"> + <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" /> <folding /> </state> </provider> @@ -139,14 +144,16 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/ecomp-portal-BE/pom.xml" /> - <option value="$PROJECT_DIR$/pom.xml" /> <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$/pom.xml" /> </list> </option> </component> @@ -185,6 +192,34 @@ <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> </subPane> </pane> <pane id="PackagesPane" /> @@ -430,7 +465,7 @@ </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> - <editor active="false" /> + <editor active="true" /> <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" /> @@ -444,7 +479,7 @@ <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.25785482" sideWeight="0.5" order="7" 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="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" /> @@ -752,22 +787,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="782"> - <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="57" selection-end-column="21" /> - <folding /> - </state> - </provider> - </entry> - <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> <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> @@ -799,14 +818,6 @@ </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="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"> @@ -871,5 +882,29 @@ </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="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" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecomp-portal-BE/pom.xml"> + <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" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <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" /> + <folding /> + </state> + </provider> + </entry> </component> </project>
\ No newline at end of file diff --git a/ecomp-portal-BE/pom.xml b/ecomp-portal-BE/pom.xml index b01fa495..cdb4a5c4 100644 --- a/ecomp-portal-BE/pom.xml +++ b/ecomp-portal-BE/pom.xml @@ -74,6 +74,14 @@ <finalName>ecompportal</finalName> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>sonar-maven-plugin</artifactId> diff --git a/ecomp-portal-FE/pom.xml b/ecomp-portal-FE/pom.xml index e7f3a5d9..97283c0a 100644 --- a/ecomp-portal-FE/pom.xml +++ b/ecomp-portal-FE/pom.xml @@ -7,6 +7,14 @@ <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> @@ -17,5 +17,35 @@ <module>ecomp-portal-FE</module> <module>ecomp-portal-BE</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>https://nexus.openecomp.org/</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> + </plugin> + </plugins> + </build> + + <distributionManagement> + <!-- Publish jars to the Nexus Repository - public group --> + <!-- The id below must match your .m2/settings.xml/servers/server/id --> + <repository> + <id>ecomp-releases</id> + <name>OpenECOMP - Release Repository</name> + <url>https://nexus.openecomp.org/content/repositories/releases/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>OpenECOMP - Snapshot Repository</name> + <url>https://nexus.openecomp.org/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> </project> |