MARMOTTA-472: fixed ugly trick with the snapshot-version

Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7689d384
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7689d384
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7689d384

Branch: refs/heads/ldp
Commit: 7689d3841fd67d66d893115a2dfb8002f6732c7c
Parents: 6a993a8
Author: Jakob Frank <[email protected]>
Authored: Wed Mar 19 19:18:01 2014 +0100
Committer: Jakob Frank <[email protected]>
Committed: Wed Mar 19 19:18:01 2014 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp/pom.xml | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/7689d384/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml 
b/launchers/marmotta-webapp/pom.xml
index 1878896..8cb4150 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -37,7 +37,6 @@
         <marmotta.context>/</marmotta.context>
         <marmotta.port>8080</marmotta.port>
         <marmotta.backend>kiwi</marmotta.backend>
-        
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
     </properties>
 
     <build>
@@ -121,23 +120,6 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <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>
                 <artifactId>jdeb</artifactId>
                 <groupId>org.vafer</groupId>
                 <version>1.1.1</version>
@@ -150,8 +132,8 @@
                         <configuration>
                             <signPackage>true</signPackage>
                             <verbose>false</verbose>
-                            
<deb>${project.build.directory}/${project.build.finalName}_${version.clean}_all.deb</deb>
-                            
<changesOut>${project.build.directory}/${project.build.finalName}_${version.clean}_all.changes</changesOut>
+                            
<deb>${project.build.directory}/${project.build.finalName}_[[version]]_all.deb</deb>
+                            
<changesOut>${project.build.directory}/${project.build.finalName}_[[version]]_all.changes</changesOut>
                             <classifier>all</classifier>
                             <snapshotExpand>true</snapshotExpand>
                             <snapshotEnv>maven.build.timestamp</snapshotEnv>

Reply via email to