Add plugin configuration to skip deploy

Change-Id: I84ff02d2336a802b73f98be7318456095f0de276
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
index fa66f26..64e166c 100755 (executable)
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -2,8 +2,8 @@
 
 source $(dirname $0)/os_settings.sh
 
-export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE}"
-#export MVN="mvn"
+# Use -B for batch operation to skip download progress output
+export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B"
 
 CURRENTDIR="$(pwd)"
 
@@ -56,7 +56,7 @@ cd $PROJECTDIR/ecomp-portal-FE-os/
 
 ${MVN} install
 
-mv target/epsdk-app-os-1.1.0 target/ep-sdk-app
+mv target/epsdk-app-os target/ep-sdk-app
 
 # now install DBC app
 cd $SOURCEDIR
@@ -95,4 +95,4 @@ fi
 
 EXEC_CMD="docker build -t ${IMGNAME} ${PROXY_ARGS} --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ."
 echo $EXEC_CMD
-$EXEC_CMD
\ No newline at end of file
+$EXEC_CMD

diff --git a/ecomp-portal-BE-common-test/pom.xml b/ecomp-portal-BE-common-test/pom.xml
index 93e153f..8ef820c 100644 (file)
--- a/ecomp-portal-BE-common-test/pom.xml
+++ b/ecomp-portal-BE-common-test/pom.xml
@@ -51,6 +51,15 @@
                                        </overlays>
                                </configuration>
                        </plugin>
+                       <!-- No deployment step for this project -->
+                       <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>

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index bf5f9f1..021310d 100644 (file)
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -115,6 +115,16 @@
                                </configuration>
                        </plugin>
                        
+                       <!-- No deployment step for this project -->
+                       <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>

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 4592749..1e64f7c 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -129,6 +129,15 @@
                                </configuration>
                        </plugin>
 
+                       <!-- No deployment step for this project -->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-deploy-plugin</artifactId>
+                               <version>2.8</version>
+                               <configuration>
+                                       <skip>true</skip>
+                               </configuration>
+                       </plugin>
 
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
@@ -198,48 +207,20 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       <!-- 
-                       <plugin>
-                           <groupId>org.codehaus.mojo</groupId>
-                           <artifactId>license-maven-plugin</artifactId>
-                           <version>1.10</version>
-                           <configuration>
-                             <encoding>UTF-8</encoding>
-                               <licenseName>my_license</licenseName>
-                               <licenseResolver>${project.baseUri}/license</licenseResolver>
-                               <inceptionYear>2017</inceptionYear>
-                               <organizationName>AT&amp;T Intellectual Property</organizationName>
-                               <projectName>ECOMP Portal</projectName> 
-                               <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> 
-                               <processStartTag>================================================================================</processStartTag>
-                               <sectionDelimiter>================================================================================</sectionDelimiter>
-                               <processEndTag>================================================================================</processEndTag> 
-                               <roots>
-                                       <root>src/main</root>
-                                       <root>src/test</root>
-                               </roots>
-                               <excludes>
-                                       <exclude>*.png</exclude>
-                                       <exclude>*.drl</exclude>
-                                       <exclude>*.gif</exclude>
-                                       <exclude>*.jpeg</exclude>
-                                       <exclude>*.jpg</exclude>
-                                       <exclude>*.bmp</exclude>
-                                       <exclude>*.ico</exclude>
-                                       <exclude>*.svg</exclude>
-                               </excludes>
-                           </configuration>
-                           <executions>
-                               <execution>
-                                   <id>first</id>
-                                   <goals>
-                                       <goal>update-file-header</goal>
-                                   </goals>
-                                   <phase>process-sources</phase>
-                               </execution>
-                           </executions>
-                       </plugin>
-                        -->
+                       <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> 
+                               <version>1.10</version> <configuration> <encoding>UTF-8</encoding> <licenseName>my_license</licenseName> 
+                               <licenseResolver>${project.baseUri}/license</licenseResolver> <inceptionYear>2017</inceptionYear> 
+                               <organizationName>AT&amp;T Intellectual Property</organizationName> <projectName>ECOMP 
+                               Portal</projectName> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> 
+                               <processStartTag>================================================================================</processStartTag> 
+                               <sectionDelimiter>================================================================================</sectionDelimiter> 
+                               <processEndTag>================================================================================</processEndTag> 
+                               <roots> <root>src/main</root> <root>src/test</root> </roots> <excludes> <exclude>*.png</exclude> 
+                               <exclude>*.drl</exclude> <exclude>*.gif</exclude> <exclude>*.jpeg</exclude> 
+                               <exclude>*.jpg</exclude> <exclude>*.bmp</exclude> <exclude>*.ico</exclude> 
+                               <exclude>*.svg</exclude> </excludes> </configuration> <executions> <execution> 
+                               <id>first</id> <goals> <goal>update-file-header</goal> </goals> <phase>process-sources</phase> 
+                               </execution> </executions> </plugin> -->
                </plugins>
 
                <testResources>

diff --git a/ecomp-portal-FE-os/pom.xml b/ecomp-portal-FE-os/pom.xml
index 011a924..e54b518 100644 (file)
--- a/ecomp-portal-FE-os/pom.xml
+++ b/ecomp-portal-FE-os/pom.xml
@@ -177,6 +177,15 @@
                                        </execution>
 
                                </executions>
+                       </plugin>
+                       <!-- No deployment step for this project -->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-deploy-plugin</artifactId>
+                               <version>2.8</version>
+                               <configuration>
+                                       <skip>true</skip>
+                               </configuration>
                        </plugin>
                         <!--    
                        <plugin>