X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdnr%2Fwt%2Fodlux%2Fframework%2Fpom.xml;h=dc43729b5fbba188a321bedf83020ea4ff02c962;hb=eafb2635f98d75a25769cb35c654b46b303d78c3;hp=7cc8a9b5d48b40de64a57b349a0f0c8bc2e5b2d5;hpb=05e4277510b9947e3cdcbab8c7bb3846a4211af6;p=ccsdk%2Ffeatures.git

diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index 7cc8a9b5d..dc43729b5 100644
--- a/sdnr/wt/odlux/framework/pom.xml
+++ b/sdnr/wt/odlux/framework/pom.xml
@@ -1,20 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ============LICENSE_START=======================================================
+  ~ ONAP : ccsdk features
+  ~ ================================================================================
+  ~ Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+  ~ ================================================================================
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~ ============LICENSE_END=======================================================
+  ~
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>2.3.3</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-odlux-framework</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>sdnr-wt-odlux-framework</name>
+    <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -24,28 +44,21 @@
 
     <properties>
         <buildtime>${maven.build.timestamp}</buildtime>
-        <distversion>ONAP Dublin (Flourine-SR2)</distversion>
-        <buildno>15.b8b89e4(19/08/12)</buildno>
+        <distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
+        <buildno>142.63ceae1(22/01/31)</buildno>
         <odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
     </properties>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>highstreet repo</id>
-            <url>https://cloud-highstreet-technologies.com/mvn/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <resources>
             <resource>
                 <directory>dist</directory>
                 <targetPath>odlux</targetPath>
             </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -77,9 +90,9 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>de.jacksitlab</groupId>
+                <groupId>de.jacks-it-lab</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.7.1</version>
+                <version>1.7.2</version>
                 <executions>
                     <execution>
                         <id>install node and yarn</id>
@@ -89,8 +102,20 @@
                         <!-- optional: default phase is "generate-resources" -->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.10.0</nodeVersion>
-                            <yarnVersion>v1.12.3</yarnVersion>
+                            <nodeVersion>v12.13.0</nodeVersion>
+                            <yarnVersion>v1.22.10</yarnVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>clear cache</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <arguments>cache clean</arguments>
+                            <installDirectory>${project.basedir}</installDirectory>
+                            <workingDirectory>${project.basedir}/../</workingDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -100,7 +125,7 @@
                         </goals>
                         <phase>initialize</phase>
                         <configuration>
-                            <arguments>add lerna@3.13.1 -W --exact</arguments>
+                            <arguments>add lerna@3.22.1 -W --exact</arguments>
                             <installDirectory>${project.basedir}</installDirectory>
                             <workingDirectory>${project.basedir}/../</workingDirectory>
                         </configuration>
@@ -132,6 +157,24 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>${basedir}/../odlux.properties</file>
+                            </files>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
@@ -150,12 +193,69 @@
                     <basedir>${project.build.directory}/classes/odlux</basedir>
                     <includes>
                         <include>app.js</include>
+                        <include>version.json</include>
                     </includes>
                     <replacements>
                         <replacement>
                             <token>##odlux.version##</token>
                             <value>${odlux.version}</value>
                         </replacement>
+                        <replacement>
+                            <token>##buildno##</token>
+                            <value>${buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##build-timestamp##</token>
+                            <value>${buildtime}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.framework.buildno##</token>
+                            <value>${odlux.framework.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.configurationApp.buildno##</token>
+                            <value>${odlux.apps.configurationApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.connectApp.buildno##</token>
+                            <value>${odlux.apps.connectApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.eventLogApp.buildno##</token>
+                            <value>${odlux.apps.eventLogApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.faultApp.buildno##</token>
+                            <value>${odlux.apps.faultApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.helpApp.buildno##</token>
+                            <value>${odlux.apps.helpApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.inventoryApp.buildno##</token>
+                            <value>${odlux.apps.inventoryApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.linkCalculationApp.buildno##</token>
+                            <value>${odlux.apps.linkCalculationApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.maintenanceApp.buildno##</token>
+                            <value>${odlux.apps.maintenanceApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.mediatorApp.buildno##</token>
+                            <value>${odlux.apps.mediatorApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.networkMapApp.buildno##</token>
+                            <value>${odlux.apps.networkMapApp.buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##odlux.apps.permanceHistoryApp.buildno##</token>
+                            <value>${odlux.apps.permanceHistoryApp.buildno}</value>
+                        </replacement>
                     </replacements>
                 </configuration>
             </plugin>