Skip to content

Commit

Permalink
version refactor of pom
Browse files Browse the repository at this point in the history
  • Loading branch information
@supertick
supertick committed Oct 14, 2023
1 parent 1038b40 commit 5ee2ad1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 94 deletions.
4 changes: 2 additions & 2 deletions assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<include>myrobotlab.sh</include>
</includes>
<directory>./</directory>
<outputDirectory>myrobotlab-${version.prefix}${build.number}</outputDirectory>
<outputDirectory>myrobotlab-${version}</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<includes>
<include>myrobotlab.jar</include>
</includes>
<directory>target</directory>
<outputDirectory>myrobotlab-${version.prefix}${build.number}</outputDirectory>
<outputDirectory>myrobotlab-${version}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
1 change: 0 additions & 1 deletion build.properties
View file

This file was deleted.

45 changes: 1 addition & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
<!--
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
49 changes: 2 additions & 47 deletions src/main/resources/resource/framework/pom.xml.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
<!--
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 5ee2ad1

Please sign in to comment.