Merge pull request #14 from Telecominfraproject/WIFI-7556

WIFI-7556 updated spring-boot version to 2.5.12 (spring 5.3.18) to co…

.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,6 +41,26 @@ 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')

README.md

@@ -13,7 +13,7 @@ Build instructions:
 ### Executable jar files:
 All the applications in this section by default use the certificates generated by scripts in [wlan-pki-cert-scripts](https://github.com/Telecominfraproject/wlan-pki-cert-scripts) repository. They expect the certificates to be in /opt/tip-wlan/certs directory. All the settings - filenames, paths, passwords are configurable via environment variables and java system properties. For configuration details please see the CloudSDK  Configuration Guide (TBD).
   
-* wlan-opensync-wifi-controller/opensync-gateway-static-process/target/opensync-gateway-static-process-0.0.1-SNAPSHOT.jar
+* wlan-opensync-wifi-controller/opensync-gateway-static-process/target/opensync-gateway-static-process-1.2.0-SNAPSHOT.jar
 
 > 
 Stand-alone opensync gateway, statically configured by config files

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"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>0.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../wlan-cloud-root</relativePath>
 	</parent>
 
@@ -21,8 +20,7 @@
                                 </property>
                                 <activeByDefault>true</activeByDefault>
                         </activation>
-                        <modules>
-                                <module>../wlan-cloud-root</module>
+                        <modules>                                                      
                                 <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.2.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>
+
+