projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
847d466
)
Make Maven RPM build easier to configure.
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 13 Nov 2021 07:33:50 +0000
(08:33 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 13 Nov 2021 07:33:50 +0000
(08:33 +0100)
cnf/unstable.bnd
patch
|
blob
|
history
dep/org.argeo.dep.cms.client/pom.xml
patch
|
blob
|
history
dep/org.argeo.dep.cms.e4.rap/pom.xml
patch
|
blob
|
history
dep/org.argeo.dep.cms.ext/pom.xml
patch
|
blob
|
history
dep/org.argeo.dep.cms.node/pom.xml
patch
|
blob
|
history
dep/org.argeo.dep.cms.ui.rap/pom.xml
patch
|
blob
|
history
dist/argeo-cli/pom.xml
patch
|
blob
|
history
dist/argeo-node/pom.xml
patch
|
blob
|
history
dist/osgi-boot/pom.xml
patch
|
blob
|
history
pom.xml
patch
|
blob
|
history
diff --git
a/cnf/unstable.bnd
b/cnf/unstable.bnd
index db4fe1b0881ee46f31003949d338090df817869c..e58775d96682e2a240d47b25dc7d6bbc91bd516e 100644
(file)
--- a/
cnf/unstable.bnd
+++ b/
cnf/unstable.bnd
@@
-1,4
+1,6
@@
category=org.argeo.commons
version.released=2.3.1
Bundle-RequiredExecutionEnvironment=JavaSE-11
category=org.argeo.commons
version.released=2.3.1
Bundle-RequiredExecutionEnvironment=JavaSE-11
+
argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
+argeo.rpm.suffix=-unstable
diff --git
a/dep/org.argeo.dep.cms.client/pom.xml
b/dep/org.argeo.dep.cms.client/pom.xml
index 54ed0595f06c9fe5aa0b619029ddd69d11183cc0..ffa77ff228260d836672340d4d6e917a5c030a34 100644
(file)
--- a/
dep/org.argeo.dep.cms.client/pom.xml
+++ b/
dep/org.argeo.dep.cms.client/pom.xml
@@
-272,7
+272,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-client-unstable</name>
+ <name>argeo-cms-client${argeo.rpm.suffix}</name>
+ <projversion>${version.released}</projversion>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-291,8
+293,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-client-tp
-unstable
</require>
- <require>argeo-osgi-boot
-unstable
</require>
+ <require>argeo-cms-client-tp
${argeo.rpm.suffix}
</require>
+ <require>argeo-osgi-boot
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-333,7
+335,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-client-tp
-unstable
</name>
+ <name>argeo-cms-client-tp
${argeo.rpm.suffix}
</name>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
diff --git
a/dep/org.argeo.dep.cms.e4.rap/pom.xml
b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 508c8b8036408c49447dd75939db732841b07ef7..fe51ae9fd5f699a724a49113acc6ad88ccc27156 100644
(file)
--- a/
dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/
dep/org.argeo.dep.cms.e4.rap/pom.xml
@@
-296,7
+296,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-e4-rap-unstable</name>
+ <name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
+ <projversion>${version.released}</projversion>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-315,8
+317,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-ui-rap
-unstable
</require>
- <require>argeo-cms-e4-rap-tp
-unstable
</require>
+ <require>argeo-cms-ui-rap
${argeo.rpm.suffix}
</require>
+ <require>argeo-cms-e4-rap-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-357,7
+359,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-e4-rap-tp
-unstable
</name>
+ <name>argeo-cms-e4-rap-tp
${argeo.rpm.suffix}
</name>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
@@
-378,7
+380,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-ui-rap-tp
-unstable
</require>
+ <require>argeo-cms-ui-rap-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/dep/org.argeo.dep.cms.ext/pom.xml
b/dep/org.argeo.dep.cms.ext/pom.xml
index 61450aefa1be88c4820a4fb3f248f17237105d79..d790606647b8846d061e6f44e4f945b5153f456a 100644
(file)
--- a/
dep/org.argeo.dep.cms.ext/pom.xml
+++ b/
dep/org.argeo.dep.cms.ext/pom.xml
@@
-112,7
+112,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-ext-tp
-unstable
</name>
+ <name>argeo-cms-ext-tp
${argeo.rpm.suffix}
</name>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
@@
-133,7
+133,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node-tp
-unstable
</require>
+ <require>argeo-cms-node-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/dep/org.argeo.dep.cms.node/pom.xml
b/dep/org.argeo.dep.cms.node/pom.xml
index a1bbbca1ea32510b80365e76e6cceb3ba80e735e..bba42689861754c0b20b61e84e1c277400af1982 100644
(file)
--- a/
dep/org.argeo.dep.cms.node/pom.xml
+++ b/
dep/org.argeo.dep.cms.node/pom.xml
@@
-240,7
+240,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-node-unstable</name>
+ <name>argeo-cms-node${argeo.rpm.suffix}</name>
+ <projversion>${version.released}</projversion>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-259,8
+261,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-client
-unstable
</require>
- <require>argeo-cms-node-tp
-unstable
</require>
+ <require>argeo-cms-client
${argeo.rpm.suffix}
</require>
+ <require>argeo-cms-node-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-322,7
+324,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-client-tp
-unstable
</require>
+ <require>argeo-cms-client-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/dep/org.argeo.dep.cms.ui.rap/pom.xml
b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index e29aadf3081c7c9edc4673e459be645162b941ad..81e7ba43842ef7aa07a2e421feced2deb2beb53e 100644
(file)
--- a/
dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/
dep/org.argeo.dep.cms.ui.rap/pom.xml
@@
-120,7
+120,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-ui-rap-unstable</name>
+ <name>argeo-cms-ui-rap${argeo.rpm.suffix}</name>
+ <projversion>${version.released}</projversion>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-181,7
+183,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-ui-rap-tp
-unstable
</name>
+ <name>argeo-cms-ui-rap-tp
${argeo.rpm.suffix}
</name>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
@@
-202,7
+204,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node-tp
-unstable
</require>
+ <require>argeo-cms-node-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/dist/argeo-cli/pom.xml
b/dist/argeo-cli/pom.xml
index a4b6c07cb06fdbe354cab93cd9338d978403f976..2efaf760c1e7d3f331a4f18010cd135bbe43dc4c 100644
(file)
--- a/
dist/argeo-cli/pom.xml
+++ b/
dist/argeo-cli/pom.xml
@@
-67,7
+67,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cli
-unstable
</name>
+ <name>argeo-cli
${argeo.rpm.suffix}
</name>
<mappings>
<mapping>
<directory>/etc/argeo-cli</directory>
<mappings>
<mapping>
<directory>/etc/argeo-cli</directory>
diff --git
a/dist/argeo-node/pom.xml
b/dist/argeo-node/pom.xml
index 9575a73f7c11336c3953b212249d06d7cab36515..612611023967916df93bc6c50c115a632f0d7bbd 100644
(file)
--- a/
dist/argeo-node/pom.xml
+++ b/
dist/argeo-node/pom.xml
@@
-75,7
+75,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-node
-unstable
</name>
+ <name>argeo-node
${argeo.rpm.suffix}
</name>
<mappings>
<mapping>
<directory>/etc/argeo</directory>
<mappings>
<mapping>
<directory>/etc/argeo</directory>
@@
-182,8
+182,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>
diff --git
a/dist/osgi-boot/pom.xml
b/dist/osgi-boot/pom.xml
index c86ff6c913f93f6a0a4469cba76091a62d27f4dc..2eb7513d67c758be040ccc32b02c9b0708a7aae7 100644
(file)
--- a/
dist/osgi-boot/pom.xml
+++ b/
dist/osgi-boot/pom.xml
@@
-69,7
+69,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-osgi-boot
-unstable
</name>
+ <name>argeo-osgi-boot
${argeo.rpm.suffix}
</name>
<mappings>
<mapping>
<directory>/usr/bin</directory>
<mappings>
<mapping>
<directory>/usr/bin</directory>
@@
-117,7
+117,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-osgi-boot-equinox
-unstable
</require>
+ <require>argeo-osgi-boot-equinox
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-141,7
+141,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-osgi-boot-equinox
-unstable
</name>
+ <name>argeo-osgi-boot-equinox
${argeo.rpm.suffix}
</name>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
<projversion>${version.argeo-tp}</projversion>
<release>${maven.build.timestamp}</release>
<mappings>
diff --git
a/pom.xml
b/pom.xml
index 42b0e1fa94843e5582c9a06febee25bb909d468d..0acc28edf73feb2fcb5f0e2299b4a81c80f8da00 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-14,7
+14,6
@@
<url>http://www.argeo.org/</url>
<properties>
<version.argeo-tp>2.1.27</version.argeo-tp>
<url>http://www.argeo.org/</url>
<properties>
<version.argeo-tp>2.1.27</version.argeo-tp>
- <!-- RPM -->
<project.scm.id>code.argeo.org</project.scm.id>
</properties>
<modules>
<project.scm.id>code.argeo.org</project.scm.id>
</properties>
<modules>