You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/02/20 10:11:03 UTC
git commit: MARMOTTA-431: last details
Repository: marmotta
Updated Branches:
refs/heads/develop 37701d5ee -> 5fa42d206
MARMOTTA-431: last details
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5fa42d20
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5fa42d20
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5fa42d20
Branch: refs/heads/develop
Commit: 5fa42d206a192811ac5eeb273e0b127db9ddd015
Parents: 37701d5
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 20 10:10:49 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 20 10:10:49 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 15 ++++++++++++++-
launchers/marmotta-webapp/src/deb/control/control | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fa42d20/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 2d41f9b..f747fde 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -121,6 +121,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<!--required for generating proper .changes: <version>1.1-SNAPSHOT</version>-->
@@ -132,7 +145,7 @@
<goal>jdeb</goal>
</goals>
<configuration>
- <deb>${project.build.directory}/${project.artifactId}_${project.version}-${maven.build.timestamp}_all.deb</deb>
+ <deb>${project.build.directory}/${project.artifactId}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
<controlDir>${basedir}/src/deb/control</controlDir>
<dataSet>
<data>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5fa42d20/launchers/marmotta-webapp/src/deb/control/control
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/control b/launchers/marmotta-webapp/src/deb/control/control
index d90993d..103e14c 100644
--- a/launchers/marmotta-webapp/src/deb/control/control
+++ b/launchers/marmotta-webapp/src/deb/control/control
@@ -1,4 +1,4 @@
-Package: marmotta
+Package: marmotta-webapp
Version: [[version]]
Section: java
Priority: extra