Merge "Fix ep:1610-1 build process"

[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 8ff8768..4592749 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -11,16 +11,17 @@
                <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>
                <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
-               <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
        </properties>
 
        <reporting>
@@ -41,7 +42,6 @@
                                        <useStandardDocletOptions>true</useStandardDocletOptions>
                                </configuration>
                        </plugin>
-               
                </plugins>
        </reporting>
        <distributionManagement>
@@ -51,29 +51,20 @@
                </site>
        </distributionManagement>
        <repositories>
-                               <repository>
-                       <!-- Snapshots repository has ECOMP snapshot artifacts -->
+               <repository>
                        <id>ecomp-releases</id>
                        <name>OpenECOMP - Release Repository</name>
                        <url>${nexusproxy}/${releaseNexusPath}</url>
                </repository>
                <repository>
-                       <!-- Snapshots repository has ECOMP snapshot artifacts -->
-                       <id>ecomp-snapshots</id>
-                       <name>OpenECOMP - Snapshot Repository</name>
-                       <url>${nexusproxy}/${snapshotNexusPath}</url>
-               </repository>
-               <repository>
-                       <!-- Staging repository has ECOMP staging artifacts -->
-                       <id>ecomp-staging</id>
-                       <name>OpenECOMP - Staging Repository</name>
-                       <url>${nexusproxy}/${stagingNexusPath}</url>
+                       <id>ecomp-snapshots</id>
+                       <name>OpenECOMP - Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
                </repository>
                <repository>
-                       <!-- Snapshots repository has ECOMP snapshot artifacts -->
-                                       <id>ecomp-public</id>
-                       <name>ecomp onap public Repository</name>
-                       <url>https://nexus.onap.org/content/groups/public</url>
+                       <id>ecomp-public</id>
+                       <name>ecomp onap public Repository</name>
+                       <url>https://nexus.onap.org/content/groups/public</url>
                </repository>
        </repositories>
 
@@ -120,7 +111,7 @@
                                                        <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>
@@ -702,6 +693,16 @@
                        </exclusions>
                </dependency>
 
+               <dependency>
+                       <groupId>org.aspectj</groupId>
+                       <artifactId>aspectjrt</artifactId>
+                       <version>1.8.9</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.aspectj</groupId>
+                       <artifactId>aspectjweaver</artifactId>
+                       <version>1.8.9</version>
+               </dependency>
 
        </dependencies>
 </project>