From 5ee2ad197c632744a24980864b45a0c9ac6ae67d Mon Sep 17 00:00:00 2001
From: grog <grog@myrobotlab.org>
Date: Fri, 13 Oct 2023 20:35:51 -0700
Subject: [PATCH] version refactor of pom

---
 assembly.xml                                  |  4 +-
 build.properties                              |  1 -
 pom.xml                                       | 45 +----------------
 .../resource/framework/pom.xml.template       | 49 +------------------
 4 files changed, 5 insertions(+), 94 deletions(-)
 delete mode 100644 build.properties

diff --git a/assembly.xml b/assembly.xml
index 69f4e96e06..562bd86cf8 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -14,7 +14,7 @@
                 <include>myrobotlab.sh</include>
             </includes>
             <directory>./</directory>
-            <outputDirectory>myrobotlab-${version.prefix}${build.number}</outputDirectory>
+            <outputDirectory>myrobotlab-${version}</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
@@ -22,7 +22,7 @@
                 <include>myrobotlab.jar</include>
             </includes>
             <directory>target</directory>
-            <outputDirectory>myrobotlab-${version.prefix}${build.number}</outputDirectory>
+            <outputDirectory>myrobotlab-${version}</outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 775fc8f8ca..0000000000
--- a/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-global.build.number=0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f5f7390a58..a00bd0db4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
   <name>MyRobotLab</name>
   <description>Open Source Creative Machine Control</description>
   <properties>
-      <!-- TODO all manually set manifest properties here e.g. <build.number>${env.BUILD_NUMBER} - for clarity !!!! -->
       <dependency.locations.enabled>false</dependency.locations.enabled>
       <!-- begin env vars -->
       <!-- 
@@ -81,7 +80,6 @@
       <!-- force overriding property at command line, use ${maven.build.timestamp}-->
       <timestamp>${maven.build.timestamp}</timestamp>
       <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>      
-      <build.number>${timestamp}</build.number>
       <version>${version}</version>   
       <GitBranch>${git.branch}</GitBranch>
       <username>${NODE_NAME}</username>      
@@ -1814,47 +1812,6 @@
             </execution>
         </executions>
       </plugin>
-
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>properties-maven-plugin</artifactId>        
-          <executions>
-            <execution>
-              <phase>initialize</phase>
-              <goals>
-                <goal>read-project-properties</goal>
-              </goals>
-              <configuration>
-                <files>
-                  <file>build.properties</file>
-                </files>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-  
-      <!-- removed because now we generate serviceData.json during runtime plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>service-data-execution</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>org.myrobotlab.framework.repo.ServiceData</mainClass>
-          <classpathScope>test</classpathScope>
-          <arguments>
-                  <argument>target/classes/resource/framework</argument>
-                </arguments>
-        </configuration>
-      </plugin -->
-    
       <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -1884,7 +1841,7 @@
                                           <Major-Version>${version}</Major-Version>
                                           <Implementation-Version>${version}</Implementation-Version>                               
               
-                        <Build-Version>${build.number}</Build-Version>
+                        <Build-Version>${version}</Build-Version>
                         <Build-Time>${maven.build.timestamp}</Build-Time>
                         <Build-Host>${agent.name}</Build-Host>
                         <Build-User>${user.name}</Build-User>
diff --git a/src/main/resources/resource/framework/pom.xml.template b/src/main/resources/resource/framework/pom.xml.template
index 7713649881..ce45f6285a 100644
--- a/src/main/resources/resource/framework/pom.xml.template
+++ b/src/main/resources/resource/framework/pom.xml.template
@@ -68,7 +68,6 @@
   <name>MyRobotLab</name>
   <description>Open Source Creative Machine Control</description>
   <properties>
-      <!-- TODO all manually set manifest properties here e.g. <build.number>${env.BUILD_NUMBER} - for clarity !!!! -->
       <dependency.locations.enabled>false</dependency.locations.enabled>
       <!-- begin env vars -->
       <!-- 
@@ -78,13 +77,10 @@
         maven or jenkins can do this
         
        -->
-      <!-- from jenkins env vars -->
-      <version.prefix>1.1.</version.prefix>
       <!-- force overriding property at command line, use ${maven.build.timestamp}-->
       <timestamp>${maven.build.timestamp}</timestamp>
       <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>      
-      <build.number>${timestamp}</build.number>
-      <version>${version.prefix}${build.number}</version>   
+      <version>${version}</version>   
       <GitBranch>${git.branch}</GitBranch>
       <username>${NODE_NAME}</username>      
       <platform>${NODE_LABELS}</platform>      
@@ -182,47 +178,6 @@
             </execution>
         </executions>
       </plugin>
-
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>properties-maven-plugin</artifactId>        
-          <executions>
-            <execution>
-              <phase>initialize</phase>
-              <goals>
-                <goal>read-project-properties</goal>
-              </goals>
-              <configuration>
-                <files>
-                  <file>build.properties</file>
-                </files>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-  
-      <!-- removed because now we generate serviceData.json during runtime plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
-        <executions>
-          <execution>
-            <id>service-data-execution</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>org.myrobotlab.framework.repo.ServiceData</mainClass>
-          <classpathScope>test</classpathScope>
-          <arguments>
-                  <argument>target/classes/resource/framework</argument>
-                </arguments>
-        </configuration>
-      </plugin -->
-    
       <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -252,7 +207,7 @@
                                           <Major-Version>${version}</Major-Version>
                                           <Implementation-Version>${version}</Implementation-Version>                               
               
-                        <Build-Version>${build.number}</Build-Version>
+                        <Build-Version>${version}</Build-Version>
                         <Build-Time>${maven.build.timestamp}</Build-Time>
                         <Build-Host>${agent.name}</Build-Host>
                         <Build-User>${user.name}</Build-User>