Merge pull request #13 from Telecominfraproject/WIFI-3471

WIFI-3471 Update SDK master to use image tag 1.3.0-SNAPSHOT

.github/workflows/maven-build.yml

@@ -2,7 +2,11 @@ name: Java Maven CI - TIP WLAN Cloud Master
 
 on: 
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - 'release/**'
+    tags:
+      - '*'
 
   schedule:
     # runs nightly build at 5AM
@@ -37,16 +41,46 @@ jobs:
           password: ${{ secrets.MAVEN_REPO_PASSWORD }}
       - name: Configure maven settings.xml
         run: cp .github/workflows/maven_settings_template.xml /home/runner/.m2/settings.xml
+      - name: Update version in pom.xml
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/tags\/[v]//')
+          mvn -B --file wlan-cloud-root/pom.xml versions:set -DnewVersion=$VERSION
+          mvn -B --file wlan-cloud-root/pom.xml install # put new parent version into Maven cache
+          mvn -B --file wlan-cloud-root/pom.xml versions:revert # need to revert so that child modules are able to find its parent
+          mvn -B --file all-modules-build/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-opensync-controller/opensync-gateway-static-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-opensync-controller/opensync-gateway-cloud-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/all-cloud-and-opensync-gw-in-one-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/all-cloud-in-one-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/portal-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/prov-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/ssc-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/spc-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/port-forwarding-gateway-docker/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-services/schema-generator/pom.xml versions:update-parent -DparentVersion=[$VERSION]
+          mvn -B --file wlan-cloud-root/pom.xml versions:set -DnewVersion=$VERSION
+
       - name: Updating commit file
         run: |          
           TIMESTAMP=$(date +'%Y-%m-%d')
           echo $TIMESTAMP
-          mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout -f wlan-cloud-root/pom.xml
+          MVN_VERSION=$(grep "<version>" wlan-cloud-root/pom.xml |head -2|tail -1|cut -d '>' -f2|cut -d '<' -f 1)
-          MVN_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout -f wlan-cloud-root/pom.xml)
           echo $MVN_VERSION
           echo date=$TIMESTAMP > wlan-cloud-base/base-container/src/main/resources/commit.properties
           echo commitId=$GITHUB_SHA >> wlan-cloud-base/base-container/src/main/resources/commit.properties
           echo projectVersion=$MVN_VERSION>> wlan-cloud-base/base-container/src/main/resources/commit.properties
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-opensync-controller/opensync-gateway-static-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-opensync-controller/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-opensync-controller/opensync-gateway-cloud-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/all-cloud-and-opensync-gw-in-one-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/all-cloud-and-opensync-gw-in-one-docker/src/main/docker-with-mqtt/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/all-cloud-in-one-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/portal-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/prov-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/ssc-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/spc-docker/src/main/docker/app/.
+          cp wlan-cloud-base/base-container/src/main/resources/commit.properties wlan-cloud-services/port-forwarding-gateway-docker/src/main/docker/app/.
         env:
           MAVEN_REPO_USERNAME: build-pipeline
           MAVEN_REPO_PASSWORD: ${{ secrets.MAVEN_REPO_PASSWORD }}           

README.md

@@ -4,7 +4,8 @@ Aggregation of repositories to simplify development environment.
 Build instructions:
 * make sure that java SDK 13+ is installed
 * make sure maven is installed
-* configure maven settings.xml with repository credentials
+* configure maven settings.xml with repository credentials:
+  copy [maven_settings_template.xml](https://github.com/Telecominfraproject/wlan-cloud-workspace/blob/master/.github/workflows/maven_settings_template.xml) into ~/.m2/settings.xml and replace ${env.MAVEN_REPO_USERNAME} / ${env.MAVEN_REPO_PASSWORD} with **tip-read**
 * $ git submodule update --init
 * $ mvn -B --file all-modules-build/pom.xml clean install
 

all-modules-build/pom.xml

@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
-        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>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 		<relativePath>../wlan-cloud-root</relativePath>
 	</parent>
 
@@ -21,8 +20,7 @@
                                 </property>
                                 <activeByDefault>true</activeByDefault>
                         </activation>
-                        <modules>
+                        <modules>                                                      
-                                <module>../wlan-cloud-root</module>
                                 <module>../wlan-cloud-base/base-build</module>
                                 <module>../wlan-cloud-services/cloud-services-build</module>
                                 <module>../wlan-cloud-opensync-controller/opensync-gateway-build</module>

all-modules-release/make_release.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ "x$1" == "x" ]
+then
+  echo Usage: make_release.sh new_version
+  exit 1
+fi
+
+new_version=$1
+
+PREVIOUS_VERSION=$(grep "<version>" ../wlan-cloud-root/pom.xml |head -2|tail -1|cut -d '>' -f2|cut -d '<' -f 1)
+echo "Updating TIP pom.xml files from $PREVIOUS_VERSION to version $new_version "
+
+# update versions on TIP modules using special all-modules-release
+mvn  --batch-mode release:update-versions -DdevelopmentVersion="$new_version" -DautoVersionSubmodules=true
+
+
+# update version that are not automatically updated
+sed -i '' "s/<tip-wlan-cloud.release.version>$PREVIOUS_VERSION<\/tip-wlan-cloud.release.version>/<tip-wlan-cloud.release.version>$new_version<\/tip-wlan-cloud.release.version>/g" ../wlan-cloud-root/pom.xml
+
+#update protobuff dependency under opensync-ext-interface
+sed -i '' "s/<version>$PREVIOUS_VERSION<\/version>/<version>$new_version<\/version>/g" ../wlan-cloud-opensync-controller/opensync-ext-interface/pom.xml
+
+echo "Updated TIP pom.xml files to version $new_version"
+

all-modules-release/pom.xml

@@ -0,0 +1,40 @@
+<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>com.telecominfraproject.wlan</groupId>
+			<artifactId>tip-wlan-cloud-root-pom</artifactId>
+			<version>1.3.0-SNAPSHOT</version>
+			<relativePath>../wlan-cloud-root</relativePath>
+        </parent>
+
+        <artifactId>tip-wlan-workspace-all-modules-release</artifactId>
+        <packaging>pom</packaging>
+        <description>Aggregation of all TIP modules - to release them in one shot.</description>
+
+        <profiles>
+                <profile>
+                        <id>full-build</id>
+                        <activation>
+                                <property>
+                                        <name>full-build</name>
+                                </property>
+                                <activeByDefault>true</activeByDefault>
+                        </activation>
+                        <modules>
+                                <module>../all-modules-build</module>
+                                <module>../wlan-cloud-services/all-cloud-and-opensync-gw-in-one-docker</module>
+                                <module>../wlan-cloud-services/all-cloud-in-one-docker</module>
+                                <module>../wlan-cloud-services/all-cloud-in-one-docker-with-persistence</module>
+                                <module>../wlan-cloud-services/port-forwarding-gateway-docker</module>
+                                <module>../wlan-cloud-services/portal-docker</module>                                
+                                <module>../wlan-cloud-services/prov-docker</module>
+                                <module>../wlan-cloud-services/spc-docker</module>
+                                <module>../wlan-cloud-services/ssc-docker</module>
+                                <module>../wlan-cloud-opensync-controller/opensync-gateway-cloud-docker</module>
+                                <module>../wlan-cloud-opensync-controller/opensync-gateway-static-docker</module>
+                        </modules>
+                </profile>
+        </profiles>
+</project>
+
+

wlan-cloud-devtools/postman-collections/passpoint/README

@@ -0,0 +1,3 @@
+This collection comes with the required variables defined as it's environment. It is recommended that any variable alterations or settings are performed in the Variables section of the collection, and that no other environment is used simulataneously, as this can cause confusing errors.
+
+Primary purpose of this collection is to facilitate creation of Hotspot profiles for application to an AP. Additional required configuration profiles are included.