From 691e05144e04eff0fc4b8bf885135ecd1a9ba361 Mon Sep 17 00:00:00 2001
From: Tom George <tg82490@gmail.com>
Date: Mon, 6 Jan 2020 12:58:14 -0500
Subject: [PATCH] Got a successful deploy locally

Signed-off-by: Tom George <tg82490@gmail.com>
---
 backend-base/pom.xml | 12 +++++-------
 javascript/pom.xml   | 11 ++++-------
 pom.xml              |  4 ++--
 update-versions.sh   | 25 +++++++++++++++++++------
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/backend-base/pom.xml b/backend-base/pom.xml
index 16f0077..894caad 100644
--- a/backend-base/pom.xml
+++ b/backend-base/pom.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0"?>
-<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>org.eclipse.che.incubator.workspace-telemetry</groupId>
     <artifactId>parent</artifactId>
-    <version>0.0.155</version>
+    <version>0.0.158</version>
   </parent>
   <distributionManagement>
     <repository>
@@ -14,7 +12,7 @@
     </repository>
   </distributionManagement>
   <artifactId>backend-base</artifactId>
-  <version>0.0.155</version>
+  <version>0.0.158</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.parameters>true</maven.compiler.parameters>
@@ -215,8 +213,8 @@
         </configuration>
         <executions>
           <execution>
-            <id>make-assembly</id> <!-- this is used for inheritance merges -->
-            <phase>package</phase> <!-- bind to the packaging phase -->
+            <id>make-assembly</id>
+            <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
diff --git a/javascript/pom.xml b/javascript/pom.xml
index 7d385d1..0d2dab6 100644
--- a/javascript/pom.xml
+++ b/javascript/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>org.eclipse.che.incubator.workspace-telemetry</groupId>
     <artifactId>parent</artifactId>
-    <version>0.0.155</version>
+    <version>0.0.158</version>
   </parent>
   <distributionManagement>
     <repository>
@@ -13,13 +12,13 @@
     </repository>
   </distributionManagement>
   <artifactId>javascript</artifactId>
-  <version>0.0.155</version>
+  <version>0.0.158</version>
   <packaging>pom</packaging>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.che.incubator.workspace-telemetry</groupId>
       <artifactId>backend-base</artifactId>
-      <version>0.0.3</version>
+      <version>0.0.158</version>
       <classifier>resources</classifier>
       <type>zip</type>
     </dependency>
@@ -78,12 +77,10 @@
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
         <version>1.6</version>
-
         <configuration>
           <workingDirectory>${project.basedir}/src/typescript</workingDirectory>
           <installDirectory>${project.build.directory}</installDirectory>
         </configuration>
-
         <executions>
           <execution>
             <id>install node and yarn</id>
diff --git a/pom.xml b/pom.xml
index 1ec7abf..5ec2f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.che.incubator.workspace-telemetry</groupId>
   <artifactId>parent</artifactId>
-  <version>0.0.155</version>
+  <version>0.0.158</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend-base</module>
@@ -18,7 +18,7 @@
         <artifactId>backend-base</artifactId>
         <classifier>resources</classifier>
         <type>zip</type>
-        <version>0.0.3</version>
+        <version>0.0.158</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/update-versions.sh b/update-versions.sh
index 6d65bd2..1ff0e8e 100755
--- a/update-versions.sh
+++ b/update-versions.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+
+# Set parent, backend-base, and javascript versions:
+# CURRENT_MAJOR
+# CURRENT_MINOR
+# CURRENT_PATCH
+# NEW_VERSION_STRING
 PARENT_CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 BACKEND_BASE_CURRENT_VERSION=$(mvn help:evaluate -pl backend-base -Dexpression=project.version -q -DforceStdout)
 JAVASCRIPT_CURRENT_VERSION=$(mvn help:evaluate -pl javascript -Dexpression=project.version -q -DforceStdout)
@@ -7,23 +13,30 @@ PARENT_CURRENT_MINOR=$(echo $PARENT_CURRENT_VERSION | cut -d . -f2)
 PARENT_CURRENT_PATCH=$(echo $PARENT_CURRENT_VERSION | cut -d . -f3)
 PARENT_NEW_PATCH=$((PARENT_CURRENT_PATCH+1))
 PARENT_NEW_VERSION_STRING="$PARENT_CURRENT_MAJOR.$PARENT_CURRENT_MINOR.$PARENT_NEW_PATCH"
-xq --arg NEW_VERSION_STRING "$PARENT_NEW_VERSION_STRING" -x '.project.version=$NEW_VERSION_STRING' pom.xml  > new-pom.xml
-mv new-pom.xml pom.xml
 BACKEND_BASE_CURRENT_MAJOR=$(echo $BACKEND_BASE_CURRENT_VERSION | cut -d . -f1)
 BACKEND_BASE_CURRENT_MINOR=$(echo $BACKEND_BASE_CURRENT_VERSION | cut -d . -f2)
 BACKEND_BASE_CURRENT_PATCH=$(echo $BACKEND_BASE_CURRENT_VERSION | cut -d . -f3)
 BACKEND_BASE_NEW_PATCH=$((BACKEND_BASE_CURRENT_PATCH+1))
 BACKEND_BASE_NEW_VERSION_STRING="$BACKEND_BASE_CURRENT_MAJOR.$BACKEND_BASE_CURRENT_MINOR.$BACKEND_BASE_NEW_PATCH"
-xq --arg NEW_VERSION_STRING "$BACKEND_BASE_NEW_VERSION_STRING" -x '.project.version=$NEW_VERSION_STRING' backend-base/pom.xml  > backend-base/new-pom.xml
-mv backend-base/new-pom.xml backend-base/pom.xml
-xq --arg PARENT_VERSION "$PARENT_NEW_VERSION_STRING" -x '.project.parent.version=$PARENT_VERSION' backend-base/pom.xml > backend-base/new-pom.xml
-mv backend-base/new-pom.xml backend-base/pom.xml
 JAVASCRIPT_CURRENT_MAJOR=$(echo $JAVASCRIPT_CURRENT_VERSION | cut -d . -f1)
 JAVASCRIPT_CURRENT_MINOR=$(echo $JAVASCRIPT_CURRENT_VERSION | cut -d . -f2)
 JAVASCRIPT_CURRENT_PATCH=$(echo $JAVASCRIPT_CURRENT_VERSION | cut -d . -f3)
 JAVASCRIPT_NEW_PATCH=$((JAVASCRIPT_CURRENT_PATCH+1))
 JAVASCRIPT_NEW_VERSION_STRING="$JAVASCRIPT_CURRENT_MAJOR.$JAVASCRIPT_CURRENT_MINOR.$JAVASCRIPT_NEW_PATCH"
+
+
+# Run xq (jq for XML) on each pom, replacing the old version strings with the new ones
+xq --arg NEW_VERSION_STRING "$PARENT_NEW_VERSION_STRING" -x '.project.version=$NEW_VERSION_STRING' pom.xml  > new-pom.xml
+mv new-pom.xml pom.xml
+xq --arg RESOURCES_VERSION "$BACKEND_BASE_NEW_VERSION_STRING" -x '(.project.dependencyManagement.dependencies[] | select(.artifactId == "backend-base" and .classifier=="resources") | .version) |=$RESOURCES_VERSION' pom.xml > new-pom.xml
+mv new-pom.xml pom.xml
+xq --arg NEW_VERSION_STRING "$BACKEND_BASE_NEW_VERSION_STRING" -x '.project.version=$NEW_VERSION_STRING' backend-base/pom.xml  > backend-base/new-pom.xml
+mv backend-base/new-pom.xml backend-base/pom.xml
+xq --arg PARENT_VERSION "$PARENT_NEW_VERSION_STRING" -x '.project.parent.version=$PARENT_VERSION' backend-base/pom.xml > backend-base/new-pom.xml
+mv backend-base/new-pom.xml backend-base/pom.xml
 xq --arg NEW_VERSION_STRING "$JAVASCRIPT_NEW_VERSION_STRING" -x '.project.version=$NEW_VERSION_STRING' javascript/pom.xml > javascript/new-pom.xml
 mv javascript/new-pom.xml javascript/pom.xml
 xq --arg PARENT_VERSION "$PARENT_NEW_VERSION_STRING" -x '.project.parent.version=$PARENT_VERSION' javascript/pom.xml > javascript/new-pom.xml
 mv javascript/new-pom.xml javascript/pom.xml
+xq --arg RESOURCES_VERSION "$BACKEND_BASE_NEW_VERSION_STRING" -x '(.project.dependencies[] | select(.artifactId == "backend-base" and .classifier=="resources") | .version) |=$RESOURCES_VERSION' javascript/pom.xml > javascript/new-pom.xml
+mv javascript/new-pom.xml javascript/pom.xml