Repair widget micro service, onboarding of widgets

[portal.git] / ecomp-portal-BE-os / pom.xml

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 0e7eb0b..2cf1af2 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -11,11 +11,13 @@
                <springframework.version>4.2.0.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <eelf.version>1.0.0</eelf.version>
-               <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>
-               <portal.version>1.1.0-SNAPSHOT</portal.version>
+               <epsdk.version>1.1.0</epsdk.version>
+               <portal.version>1.1.0</portal.version>
                <encoding>UTF-8</encoding>
                <!-- Tests usually require some setup that maven cannot do, so skip. -->
                <skiptests>false</skiptests>
+               <!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
+               <build.number>0</build.number>
                <sonar.exclusions>**.js</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
@@ -109,24 +111,33 @@
                                                        <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                                                </manifest>
                                                <manifestEntries>
-                                                       <Build-Number>${build.number}</Build-Number>
+                                                       <Build-Number>${project.version}.${build.number}</Build-Number>
                                                        <Build-Time>${maven.build.timestamp}</Build-Time>
                                                </manifestEntries>
                                        </archive>
                                        <overlays>
-                                               <!-- specify the order in which these should be applied -->
-                                               <overlay>
-                                                       <groupId>org.openecomp.ecompsdkos</groupId>
-                                                       <artifactId>epsdk-app-overlay</artifactId>
-                                               </overlay>
+                                               <!-- specify the order in which these should be applied -->                                             
                                                <overlay>
                                                        <groupId>org.openecomp.portal</groupId>
                                                        <artifactId>ecompportal-be-common</artifactId>
                                                </overlay>
+                                               <overlay>
+                                                       <groupId>org.openecomp.ecompsdkos</groupId>
+                                                       <artifactId>epsdk-app-overlay</artifactId>
+                                               </overlay>
                                        </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>
                                <artifactId>maven-resources-plugin</artifactId>
@@ -196,48 +207,6 @@
                                        </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>