You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@marmotta.apache.org by Jakob Frank <ja...@apache.org> on 2014/02/25 20:57:53 UTC
Re: [2/3] git commit: MARMOTTA-431: fixed version generation, both
for snapshots and releases
Why messing around with version numbers?
Best,
Jakob
On 25 February 2014 16:54, <wi...@apache.org> wrote:
> MARMOTTA-431: fixed version generation, both for snapshots and releases
>
>
> Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
> Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e3059d65
> Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e3059d65
> Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e3059d65
>
> Branch: refs/heads/develop
> Commit: e3059d659fa20c17a4b2dd69c7b2dfb2c10574ac
> Parents: 7496b4f
> Author: Sergio Fernández <wi...@apache.org>
> Authored: Tue Feb 25 16:53:40 2014 +0100
> Committer: Sergio Fernández <wi...@apache.org>
> Committed: Tue Feb 25 16:53:40 2014 +0100
>
> ----------------------------------------------------------------------
> launchers/marmotta-webapp/pom.xml | 26 +++++++++++++++-----------
> parent/pom.xml | 5 +++++
> 2 files changed, 20 insertions(+), 11 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/launchers/marmotta-webapp/pom.xml
> ----------------------------------------------------------------------
> diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
> index 748e486..03cb4fd 100644
> --- a/launchers/marmotta-webapp/pom.xml
> +++ b/launchers/marmotta-webapp/pom.xml
> @@ -121,16 +121,20 @@
> </configuration>
> </plugin>
> <plugin>
> - <groupId>org.codehaus.mojo</groupId>
> - <artifactId>build-helper-maven-plugin</artifactId>
> - <version>1.8</version>
> + <groupId>org.codehaus.gmaven</groupId>
> + <artifactId>gmaven-plugin</artifactId>
> <executions>
> - <execution>
> - <id>parse-version</id>
> - <goals>
> - <goal>parse-version</goal>
> - </goals>
> - </execution>
> + <execution>
> + <phase>generate-sources</phase>
> + <goals>
> + <goal>execute</goal>
> + </goals>
> + <configuration>
> + <source>
> + project.properties.setProperty("version.clean", "${project.version}".replace('-SNAPSHOT', '-${maven.build.timestamp}'))
> + </source>
> + </configuration>
> + </execution>
> </executions>
> </plugin>
> <plugin>
> @@ -145,8 +149,8 @@
> <goal>jdeb</goal>
> </goals>
> <configuration>
> - <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
> - <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
> + <deb>${project.build.directory}/${project.build.finalName}_${version.clean}_all.deb</deb>
> + <changesOut>${project.build.directory}/${project.build.finalName}_${version.clean}_all.changes</changesOut>
> <controlDir>${basedir}/src/deb/control</controlDir>
> <dataSet>
> <data>
>
> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index a6b1414..62d30cb 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -575,6 +575,11 @@
> <jswarn>false</jswarn>
> </configuration>
> </plugin>
> + <plugin>
> + <groupId>org.codehaus.gmaven</groupId>
> + <artifactId>gmaven-plugin</artifactId>
> + <version>1.5</version>
> + </plugin>
> </plugins>
> </pluginManagement>
> <plugins>
>
Re: [2/3] git commit: MARMOTTA-431: fixed version generation, both
for snapshots and releases
Posted by Sergio Fernández <se...@salzburgresearch.at>.
For fitting into the Debian versioning, bot with releases and snapshots.
If you know a better way to do it, whatever simplifies that would be
welcomed ;-)
On 25/02/14 20:57, Jakob Frank wrote:
> Why messing around with version numbers?
>
> Best,
> Jakob
>
> On 25 February 2014 16:54, <wi...@apache.org> wrote:
>> MARMOTTA-431: fixed version generation, both for snapshots and releases
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e3059d65
>> Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e3059d65
>> Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e3059d65
>>
>> Branch: refs/heads/develop
>> Commit: e3059d659fa20c17a4b2dd69c7b2dfb2c10574ac
>> Parents: 7496b4f
>> Author: Sergio Fernández <wi...@apache.org>
>> Authored: Tue Feb 25 16:53:40 2014 +0100
>> Committer: Sergio Fernández <wi...@apache.org>
>> Committed: Tue Feb 25 16:53:40 2014 +0100
>>
>> ----------------------------------------------------------------------
>> launchers/marmotta-webapp/pom.xml | 26 +++++++++++++++-----------
>> parent/pom.xml | 5 +++++
>> 2 files changed, 20 insertions(+), 11 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/launchers/marmotta-webapp/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
>> index 748e486..03cb4fd 100644
>> --- a/launchers/marmotta-webapp/pom.xml
>> +++ b/launchers/marmotta-webapp/pom.xml
>> @@ -121,16 +121,20 @@
>> </configuration>
>> </plugin>
>> <plugin>
>> - <groupId>org.codehaus.mojo</groupId>
>> - <artifactId>build-helper-maven-plugin</artifactId>
>> - <version>1.8</version>
>> + <groupId>org.codehaus.gmaven</groupId>
>> + <artifactId>gmaven-plugin</artifactId>
>> <executions>
>> - <execution>
>> - <id>parse-version</id>
>> - <goals>
>> - <goal>parse-version</goal>
>> - </goals>
>> - </execution>
>> + <execution>
>> + <phase>generate-sources</phase>
>> + <goals>
>> + <goal>execute</goal>
>> + </goals>
>> + <configuration>
>> + <source>
>> + project.properties.setProperty("version.clean", "${project.version}".replace('-SNAPSHOT', '-${maven.build.timestamp}'))
>> + </source>
>> + </configuration>
>> + </execution>
>> </executions>
>> </plugin>
>> <plugin>
>> @@ -145,8 +149,8 @@
>> <goal>jdeb</goal>
>> </goals>
>> <configuration>
>> - <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
>> - <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
>> + <deb>${project.build.directory}/${project.build.finalName}_${version.clean}_all.deb</deb>
>> + <changesOut>${project.build.directory}/${project.build.finalName}_${version.clean}_all.changes</changesOut>
>> <controlDir>${basedir}/src/deb/control</controlDir>
>> <dataSet>
>> <data>
>>
>> http://git-wip-us.apache.org/repos/asf/marmotta/blob/e3059d65/parent/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/parent/pom.xml b/parent/pom.xml
>> index a6b1414..62d30cb 100644
>> --- a/parent/pom.xml
>> +++ b/parent/pom.xml
>> @@ -575,6 +575,11 @@
>> <jswarn>false</jswarn>
>> </configuration>
>> </plugin>
>> + <plugin>
>> + <groupId>org.codehaus.gmaven</groupId>
>> + <artifactId>gmaven-plugin</artifactId>
>> + <version>1.5</version>
>> + </plugin>
>> </plugins>
>> </pluginManagement>
>> <plugins>
>>
--
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernandez@salzburgresearch.at
http://www.salzburgresearch.at