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 <[email protected]> Authored: Tue Feb 25 16:53:40 2014 +0100 Committer: Sergio Fernández <[email protected]> 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>
