projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Base Maven version on major.minor.
[lgpl/argeo-commons.git]
/
dist
/
argeo-node
/
pom.xml
diff --git
a/dist/argeo-node/pom.xml
b/dist/argeo-node/pom.xml
index 9575a73f7c11336c3953b212249d06d7cab36515..dda7589b9fed34c056cdc35112ec1d128e6a1d7f 100644
(file)
--- a/
dist/argeo-node/pom.xml
+++ b/
dist/argeo-node/pom.xml
@@
-2,7
+2,7
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
- <version>2.3
.1
-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
<artifactId>dist</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>dist</artifactId>
<relativePath>..</relativePath>
</parent>
@@
-16,23
+16,23
@@
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.client</artifactId>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.client</artifactId>
- <version>2.3
.1
-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.node</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.node</artifactId>
- <version>2.3
.1
-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
- <version>2.3
.1
-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>osgi-boot</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>osgi-boot</artifactId>
<type>zip</type>
- <version>2.3
.1
-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
</dependency>
</dependencies>
<build>
@@
-41,7
+41,7
@@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>argeo-node-${
project.version
}</finalName>
+ <finalName>argeo-node-${
version.released}${buildId
}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly/cms-e4-rap.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@
-75,7
+75,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-node-unstable</name>
+ <name>argeo-node${argeo.rpm.suffix}</name>
+ <projversion>${version.released}</projversion>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/etc/argeo</directory>
<mappings>
<mapping>
<directory>/etc/argeo</directory>
@@
-182,8
+184,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node
-unstable
</require>
- <require>argeo-osgi-boot
-unstable
</require>
+ <require>argeo-cms-node
${argeo.rpm.suffix}
</require>
+ <require>argeo-osgi-boot
${argeo.rpm.suffix}
</require>
<!-- do not explicitely require java -->
</requires>
</configuration>
<!-- do not explicitely require java -->
</requires>
</configuration>