projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/unstable' into testing
[lgpl/argeo-commons.git]
/
dist
/
osgi-boot
/
pom.xml
diff --git
a/dist/osgi-boot/pom.xml
b/dist/osgi-boot/pom.xml
index 239f3688c231866c588d79684a9f817e9c6060af..575b4b4f81709e465ae86987b2801114232ea996 100644
(file)
--- a/
dist/osgi-boot/pom.xml
+++ b/
dist/osgi-boot/pom.xml
@@
-35,7
+35,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>osgi-boot-${
project.version
}</finalName>
+ <finalName>osgi-boot-${
version.released
}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly/osgi-boot.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly/osgi-boot.xml</descriptor>
@@
-70,8
+70,6
@@
</goals>
<configuration>
<name>argeo-osgi-boot${argeo.rpm.suffix}</name>
</goals>
<configuration>
<name>argeo-osgi-boot${argeo.rpm.suffix}</name>
- <projversion>${version.released}</projversion>
- <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/bin</directory>
<mappings>
<mapping>
<directory>/usr/bin</directory>
@@
-145,7
+143,7
@@
<configuration>
<name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
<projversion>${version.argeo-tp}</projversion>
<configuration>
<name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
<projversion>${version.argeo-tp}</projversion>
- <release>${
maven.build.timestam
p}</release>
+ <release>${
argeo.rpm.release.t
p}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi/boot</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi/boot</directory>