Skip to content

Commit 5ee2ad1

Browse files
superticksupertick
committed
version refactor of pom
1 parent 1038b40 commit 5ee2ad1

File tree

4 files changed

+5
-94
lines changed

4 files changed

+5
-94
lines changed

‎assembly.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<include>myrobotlab.sh</include>
1515
</includes>
1616
<directory>./</directory>
17-
<outputDirectory>myrobotlab-${version.prefix}${build.number}</outputDirectory>
17+
<outputDirectory>myrobotlab-${version}</outputDirectory>
1818
<fileMode>0755</fileMode>
1919
</fileSet>
2020
<fileSet>
2121
<includes>
2222
<include>myrobotlab.jar</include>
2323
</includes>
2424
<directory>target</directory>
25-
<outputDirectory>myrobotlab-${version.prefix}${build.number}</outputDirectory>
25+
<outputDirectory>myrobotlab-${version}</outputDirectory>
2626
</fileSet>
2727
</fileSets>
2828
</assembly>

‎build.properties‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pom.xml‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
<name>MyRobotLab</name>
6969
<description>Open Source Creative Machine Control</description>
7070
<properties>
71-
<!-- TODO all manually set manifest properties here e.g. <build.number>${env.BUILD_NUMBER} - for clarity !!!! -->
7271
<dependency.locations.enabled>false</dependency.locations.enabled>
7372
<!-- begin env vars -->
7473
<!--
@@ -81,7 +80,6 @@
8180
<!-- force overriding property at command line, use ${maven.build.timestamp}-->
8281
<timestamp>${maven.build.timestamp}</timestamp>
8382
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
84-
<build.number>${timestamp}</build.number>
8583
<version>${version}</version>
8684
<GitBranch>${git.branch}</GitBranch>
8785
<username>${NODE_NAME}</username>
@@ -1814,47 +1812,6 @@
18141812
</execution>
18151813
</executions>
18161814
</plugin>
1817-
1818-
<plugin>
1819-
<groupId>org.codehaus.mojo</groupId>
1820-
<artifactId>properties-maven-plugin</artifactId>
1821-
<executions>
1822-
<execution>
1823-
<phase>initialize</phase>
1824-
<goals>
1825-
<goal>read-project-properties</goal>
1826-
</goals>
1827-
<configuration>
1828-
<files>
1829-
<file>build.properties</file>
1830-
</files>
1831-
</configuration>
1832-
</execution>
1833-
</executions>
1834-
</plugin>
1835-
1836-
<!-- removed because now we generate serviceData.json during runtime plugin>
1837-
<groupId>org.codehaus.mojo</groupId>
1838-
<artifactId>exec-maven-plugin</artifactId>
1839-
<version>1.6.0</version>
1840-
<executions>
1841-
<execution>
1842-
<id>service-data-execution</id>
1843-
<phase>prepare-package</phase>
1844-
<goals>
1845-
<goal>java</goal>
1846-
</goals>
1847-
</execution>
1848-
</executions>
1849-
<configuration>
1850-
<mainClass>org.myrobotlab.framework.repo.ServiceData</mainClass>
1851-
<classpathScope>test</classpathScope>
1852-
<arguments>
1853-
<argument>target/classes/resource/framework</argument>
1854-
</arguments>
1855-
</configuration>
1856-
</plugin -->
1857-
18581815
<plugin>
18591816
<groupId>org.apache.maven.plugins</groupId>
18601817
<artifactId>maven-shade-plugin</artifactId>
@@ -1884,7 +1841,7 @@
18841841
<Major-Version>${version}</Major-Version>
18851842
<Implementation-Version>${version}</Implementation-Version>
18861843

1887-
<Build-Version>${build.number}</Build-Version>
1844+
<Build-Version>${version}</Build-Version>
18881845
<Build-Time>${maven.build.timestamp}</Build-Time>
18891846
<Build-Host>${agent.name}</Build-Host>
18901847
<Build-User>${user.name}</Build-User>

‎src/main/resources/resource/framework/pom.xml.template‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
<name>MyRobotLab</name>
6969
<description>Open Source Creative Machine Control</description>
7070
<properties>
71-
<!-- TODO all manually set manifest properties here e.g. <build.number>${env.BUILD_NUMBER} - for clarity !!!! -->
7271
<dependency.locations.enabled>false</dependency.locations.enabled>
7372
<!-- begin env vars -->
7473
<!--
@@ -78,13 +77,10 @@
7877
maven or jenkins can do this
7978

8079
-->
81-
<!-- from jenkins env vars -->
82-
<version.prefix>1.1.</version.prefix>
8380
<!-- force overriding property at command line, use ${maven.build.timestamp}-->
8481
<timestamp>${maven.build.timestamp}</timestamp>
8582
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
86-
<build.number>${timestamp}</build.number>
87-
<version>${version.prefix}${build.number}</version>
83+
<version>${version}</version>
8884
<GitBranch>${git.branch}</GitBranch>
8985
<username>${NODE_NAME}</username>
9086
<platform>${NODE_LABELS}</platform>
@@ -182,47 +178,6 @@
182178
</execution>
183179
</executions>
184180
</plugin>
185-
186-
<plugin>
187-
<groupId>org.codehaus.mojo</groupId>
188-
<artifactId>properties-maven-plugin</artifactId>
189-
<executions>
190-
<execution>
191-
<phase>initialize</phase>
192-
<goals>
193-
<goal>read-project-properties</goal>
194-
</goals>
195-
<configuration>
196-
<files>
197-
<file>build.properties</file>
198-
</files>
199-
</configuration>
200-
</execution>
201-
</executions>
202-
</plugin>
203-
204-
<!-- removed because now we generate serviceData.json during runtime plugin>
205-
<groupId>org.codehaus.mojo</groupId>
206-
<artifactId>exec-maven-plugin</artifactId>
207-
<version>1.6.0</version>
208-
<executions>
209-
<execution>
210-
<id>service-data-execution</id>
211-
<phase>prepare-package</phase>
212-
<goals>
213-
<goal>java</goal>
214-
</goals>
215-
</execution>
216-
</executions>
217-
<configuration>
218-
<mainClass>org.myrobotlab.framework.repo.ServiceData</mainClass>
219-
<classpathScope>test</classpathScope>
220-
<arguments>
221-
<argument>target/classes/resource/framework</argument>
222-
</arguments>
223-
</configuration>
224-
</plugin -->
225-
226181
<plugin>
227182
<groupId>org.apache.maven.plugins</groupId>
228183
<artifactId>maven-shade-plugin</artifactId>
@@ -252,7 +207,7 @@
252207
<Major-Version>${version}</Major-Version>
253208
<Implementation-Version>${version}</Implementation-Version>
254209

255-
<Build-Version>${build.number}</Build-Version>
210+
<Build-Version>${version}</Build-Version>
256211
<Build-Time>${maven.build.timestamp}</Build-Time>
257212
<Build-Host>${agent.name}</Build-Host>
258213
<Build-User>${user.name}</Build-User>

0 commit comments

Comments
 (0)