projects
/
gpl
/
argeo-slc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fc94d6
)
Adapt RPM build.
author
Mathieu Baudier <mbaudier@argeo.org>
Mon, 15 Nov 2021 07:53:09 +0000
(08:53 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Mon, 15 Nov 2021 07:53:09 +0000
(08:53 +0100)
16 files changed:
.gitignore
patch
|
blob
|
history
dep/org.argeo.slc.dep.e4.rap/pom.xml
patch
|
blob
|
history
dep/org.argeo.slc.dep.minimal/pom.xml
patch
|
blob
|
history
dep/pom.xml
patch
|
blob
|
history
dist/pom.xml
patch
|
blob
|
history
dist/slc/pom.xml
patch
|
blob
|
history
legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
patch
|
blob
|
history
legacy/argeo-commons/dep/pom.xml
patch
|
blob
|
history
legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
patch
|
blob
|
history
legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
patch
|
blob
|
history
legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
patch
|
blob
|
history
legacy/argeo-commons/pom.xml
patch
|
blob
|
history
legacy/dep/org.argeo.slc.dep.backend/pom.xml
patch
|
blob
|
history
legacy/dep/org.argeo.slc.dep.spring/pom.xml
patch
|
blob
|
history
legacy/dep/pom.xml
patch
|
blob
|
history
pom.xml
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index b83d22266ac8aa2f8df2edef68082c789727841d..492e809ea5293775af439187d46c91da46ee80da 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1
+1,4
@@
-/target/
+**/bin/
+**/target/
+**/generated/
+**/MANIFEST.MF
diff --git
a/dep/org.argeo.slc.dep.e4.rap/pom.xml
b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 7f9189cb781818f21c5d571573cc0f29f765503c..b533a069ec92d82ae4c2a0bdbb8d6762e32d4976 100644
(file)
--- a/
dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/
dep/org.argeo.slc.dep.e4.rap/pom.xml
@@
-97,7
+97,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-slc-e4-rap</name>
+ <name>argeo-slc-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>
@@
-116,9
+118,9
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-e4-rap</require>
- <require>argeo-cms-sdk-tp</require>
- <require>argeo-slc</require>
+ <require>argeo-cms-e4-rap
${argeo.rpm.suffix}
</require>
+ <require>argeo-cms-sdk-tp
${argeo.rpm.suffix}
</require>
+ <require>argeo-slc
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/dep/org.argeo.slc.dep.minimal/pom.xml
b/dep/org.argeo.slc.dep.minimal/pom.xml
index dda7e333dfaab86e60ee920df083e74058c96744..276d1fa08d82face21a827eef8c00835c94025df 100644
(file)
--- a/
dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/
dep/org.argeo.slc.dep.minimal/pom.xml
@@
-253,7
+253,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-slc</name>
+ <name>argeo-slc${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>
@@
-272,8
+274,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node</require>
- <require>argeo-slc-tp</require>
+ <require>argeo-cms-node
${argeo.rpm.suffix}
</require>
+ <require>argeo-slc-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-314,7
+316,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-slc-tp</name>
+ <name>argeo-slc-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>
@@
-335,7
+337,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-ext-tp</require>
+ <require>argeo-cms-ext-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/dep/pom.xml
b/dep/pom.xml
index 33c2e9d068e632685e11e14d3bad77a088abaafd..c463f27cdfe7e1ed4ea1e047324461938acab394 100644
(file)
--- a/
dep/pom.xml
+++ b/
dep/pom.xml
@@
-24,6
+24,16
@@
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../cnf/${version.context}.bnd</file>
+ </files>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>argeo-osgi-plugin</artifactId>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>argeo-osgi-plugin</artifactId>
diff --git
a/dist/pom.xml
b/dist/pom.xml
index 7a1611908de244034aa2394b0337227a3126f38d..9ec9b510ae645f2324aafb0fea7d6ef79487c014 100644
(file)
--- a/
dist/pom.xml
+++ b/
dist/pom.xml
@@
-3,7
+3,7
@@
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>argeo-slc</artifactId>
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>argeo-slc</artifactId>
- <version>2.1.
18
-SNAPSHOT</version>
+ <version>2.1.
3
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.argeo.slc</groupId>
<relativePath>..</relativePath>
</parent>
<groupId>org.argeo.slc</groupId>
diff --git
a/dist/slc/pom.xml
b/dist/slc/pom.xml
index 9cb6485261b3a3ff3a3b0346cbeb7bd18a516331..fdac17f56ee621cdf778fa735dd48fa7f7bf4bae 100644
(file)
--- a/
dist/slc/pom.xml
+++ b/
dist/slc/pom.xml
@@
-3,7
+3,7
@@
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>dist</artifactId>
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>dist</artifactId>
- <version>2.1.
18
-SNAPSHOT</version>
+ <version>2.1.
3
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>slc</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>slc</artifactId>
@@
-62,7
+62,7
@@
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.dep.backend</artifactId>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.dep.backend</artifactId>
- <version>2.1.
18
-SNAPSHOT</version>
+ <version>2.1.
3
-SNAPSHOT</version>
<type>pom</type>
</dependency>
<type>pom</type>
</dependency>
@@
-70,19
+70,19
@@
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.lib.jcr</artifactId>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.lib.jcr</artifactId>
- <version>2.1.
18
-SNAPSHOT</version>
+ <version>2.1.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.lib.repo</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.lib.repo</artifactId>
- <version>2.1.
18
-SNAPSHOT</version>
+ <version>2.1.
3
-SNAPSHOT</version>
</dependency>
<!-- Launcher -->
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.launcher</artifactId>
</dependency>
<!-- Launcher -->
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.launcher</artifactId>
- <version>2.1.
18
-SNAPSHOT</version>
+ <version>2.1.
3
-SNAPSHOT</version>
<!-- <type>tar.gz</type> -->
<!-- <classifier>base</classifier> -->
</dependency>
<!-- <type>tar.gz</type> -->
<!-- <classifier>base</classifier> -->
</dependency>
diff --git
a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
index b91d02b8113fe67370a154070bc65689383829ad..20d0824da68fcc4b52d96bb3ce5866d6857ff30b 100644
(file)
--- a/
legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/
legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>legacy-dep</artifactId>
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>legacy-dep</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.dep.cms.platform</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.dep.cms.platform</artifactId>
@@
-67,17
+67,17
@@
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.cms.ui.workbench</artifactId>
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.cms.ui.workbench</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
</dependency>
<!-- Misc Third Parties -->
</dependency>
<!-- Misc Third Parties -->
@@
-299,7
+299,8
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-platform</name>
+ <name>argeo-cms-platform${argeo.rpm.suffix}</name>
+ <release>${maven.build.timestamp}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-318,8
+319,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node</require>
- <require>argeo-cms-platform-tp</require>
+ <require>argeo-cms-node
${argeo.rpm.suffix}
</require>
+ <require>argeo-cms-platform-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-360,7
+361,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-cms-platform-tp</name>
+ <name>argeo-cms-platform-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>
@@
-381,7
+382,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node-tp</require>
+ <require>argeo-cms-node-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/legacy/argeo-commons/dep/pom.xml
b/legacy/argeo-commons/dep/pom.xml
index 12412339571915a4abcfbdbb793d08991e89b683..54ee613130c0ea2a33bd8afc3984f7cbe992ffa1 100644
(file)
--- a/
legacy/argeo-commons/dep/pom.xml
+++ b/
legacy/argeo-commons/dep/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>legacy-dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>legacy-dep</artifactId>
@@
-24,6
+24,16
@@
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../../../cnf/${version.context}.bnd</file>
+ </files>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>argeo-osgi-plugin</artifactId>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>argeo-osgi-plugin</artifactId>
diff --git
a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
index 54bf5a0e8e0768fe4a6ea5179a416f3aada3dc81..b86f29eee14a58a2bb1da3c92fdfcf73cc7a4a3e 100644
(file)
--- a/
legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
+++ b/
legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
@@
-14,7
+14,7
@@
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.cms.ui.workbench</artifactId>
<dependency>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>org.argeo.cms.ui.workbench</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
</dependency>
<!-- RAP specific -->
<dependency>
</dependency>
<!-- RAP specific -->
<dependency>
diff --git
a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
index 2bd30abbf9838fef50b9170f7c34c7d6a525d02c..b19ccb9ed4947c2469c67e4e7a45d24609d1e8d7 100644
(file)
--- a/
legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
+++ b/
legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.cms.ui.workbench</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.cms.ui.workbench</artifactId>
diff --git
a/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
b/legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
index 05b3e78d02ef4aa8a8624c14c2775e402681c81e..5fe3b4a11d5300696e61837d6c78cac0bcd9d85f 100644
(file)
--- a/
legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
+++ b/
legacy/argeo-commons/org.argeo.ext.rap.ui.workbench/pom.xml
@@
-3,7
+3,7
@@
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
<parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
diff --git
a/legacy/argeo-commons/pom.xml
b/legacy/argeo-commons/pom.xml
index 5e1672ba76b3404821c94952be6fb9609792610b..7e0e0d806ffa68b068bd43e957e32b1b778ca6d0 100644
(file)
--- a/
legacy/argeo-commons/pom.xml
+++ b/
legacy/argeo-commons/pom.xml
@@
-9,7
+9,7
@@
</parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
</parent>
<groupId>org.argeo.slc.legacy.commons</groupId>
<artifactId>argeo-commons-legacy</artifactId>
- <version>2.1.8
6
</version>
+ <version>2.1.8
7-SNAPSHOT
</version>
<name>Commons Legacy</name>
<packaging>pom</packaging>
<properties>
<name>Commons Legacy</name>
<packaging>pom</packaging>
<properties>
diff --git
a/legacy/dep/org.argeo.slc.dep.backend/pom.xml
b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
index 92b4ee47233508ffbffc889c85661ec307c37009..0e6de0980b3199cbefb27a8b5254ff94ee5bfc3c 100644
(file)
--- a/
legacy/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/
legacy/dep/org.argeo.slc.dep.backend/pom.xml
@@
-2,15
+2,12
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.slc</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.slc</groupId>
- <artifactId>dep</artifactId>
+ <artifactId>
legacy-
dep</artifactId>
<version>2.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.slc.dep.backend</artifactId>
<name>SLC Backend</name>
<version>2.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.slc.dep.backend</artifactId>
<name>SLC Backend</name>
- <properties>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
- </properties>
<dependencies>
<!-- SLC Minimal -->
<dependency>
<dependencies>
<!-- SLC Minimal -->
<dependency>
@@
-36,13
+33,13
@@
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.support</artifactId>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.support</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.server.repo</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.server.repo</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.argeo.slc</groupId> -->
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.argeo.slc</groupId> -->
@@
-54,17
+51,17
@@
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.client.ui</artifactId>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.client.ui</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.client.ui.dist</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.client.ui.dist</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.client.rap</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.client.rap</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<!-- OSGi Boot for platform generation only, as it could be used by regular
</dependency>
<!-- OSGi Boot for platform generation only, as it could be used by regular
@@
-126,7
+123,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>slc-platform</name>
+ <name>argeo-slc-platform${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>
@@
-145,8
+144,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-platform</require>
- <require>
slc-spring
</require>
+ <require>argeo-cms-platform
${argeo.rpm.suffix}
</require>
+ <require>
argeo-slc-spring${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
diff --git
a/legacy/dep/org.argeo.slc.dep.spring/pom.xml
b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
index 11e61df1dc29b8934cd628ab945c81e5cfc7f36d..e0bb73d26d53fa6b465e71bcc37a26f5e8c69f3f 100644
(file)
--- a/
legacy/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/
legacy/dep/org.argeo.slc.dep.spring/pom.xml
@@
-1,16
+1,15
@@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.slc</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.slc</groupId>
- <artifactId>dep</artifactId>
+ <artifactId>
legacy-
dep</artifactId>
<version>2.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.slc.dep.spring</artifactId>
<name>SLC Agent based on Spring</name>
<version>2.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.slc.dep.spring</artifactId>
<name>SLC Agent based on Spring</name>
- <properties>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
- </properties>
<dependencies>
<!-- Parent dependencies -->
<dependency>
<dependencies>
<!-- Parent dependencies -->
<dependency>
@@
-24,22
+23,22
@@
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.spring</artifactId>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.spring</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.support</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.support</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.agent</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.agent</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.agent.jcr</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.agent.jcr</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<!-- Transitional fake Java 8 APIs, required by old version of Spring,
</dependency>
<!-- Transitional fake Java 8 APIs, required by old version of Spring,
@@
-47,7
+46,7
@@
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.legacy.fake.java8</artifactId>
<dependency>
<groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.legacy.fake.java8</artifactId>
- <version>2.
1.18
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
</dependency>
<!-- Not strictly Spring dependencies but used by the old approach -->
</dependency>
<!-- Not strictly Spring dependencies but used by the old approach -->
@@
-193,7
+192,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>slc-spring</name>
+ <name>argeo-slc-spring${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>
@@
-212,10
+213,10
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-node</require>
- <require>argeo-slc</require>
- <require>argeo-slc-tp</require>
- <require>
slc-spring-tp
</require>
+ <require>argeo-cms-node
${argeo.rpm.suffix}
</require>
+ <require>argeo-slc
${argeo.rpm.suffix}
</require>
+ <require>argeo-slc-tp
${argeo.rpm.suffix}
</require>
+ <require>
argeo-slc-spring-tp${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-256,7
+257,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>
slc-spring-tp
</name>
+ <name>
argeo-slc-spring-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/legacy/dep/pom.xml
b/legacy/dep/pom.xml
index 852a91f89af09c8c571c614df3a14c0f11134e5c..affcea4a4677cb8541e6227f0c40964e4308a7c6 100644
(file)
--- a/
legacy/dep/pom.xml
+++ b/
legacy/dep/pom.xml
@@
-7,7
+7,7
@@
<relativePath>..</relativePath>
</parent>
<artifactId>legacy-dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>legacy-dep</artifactId>
- <name>SLC L
E
gacy Dependencies</name>
+ <name>SLC L
e
gacy Dependencies</name>
<packaging>pom</packaging>
<modules>
<module>org.argeo.slc.dep.spring</module>
<packaging>pom</packaging>
<modules>
<module>org.argeo.slc.dep.spring</module>
@@
-24,6
+24,16
@@
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../../cnf/${version.context}.bnd</file>
+ </files>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>argeo-osgi-plugin</artifactId>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<artifactId>argeo-osgi-plugin</artifactId>
diff --git
a/pom.xml
b/pom.xml
index 68da924b8fccc99fd78cb1d909ca42b8ed9ec383..8a27ddd420bbd90e4675a8f9fbf141498ad29b2a 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-11,16
+11,14
@@
<name>Argeo SLC</name>
<version>2.3-SNAPSHOT</version>
<properties>
<name>Argeo SLC</name>
<version>2.3-SNAPSHOT</version>
<properties>
+ <version.context>unstable</version.context>
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
- <version.slc>2.3-SNAPSHOT</version.slc>
<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
<developmentCycle.slc>2.3</developmentCycle.slc>
<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
<developmentCycle.slc>2.3</developmentCycle.slc>
- <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
-
- <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ <version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
</properties>
<modules>
<!-- SLC framework -->
</properties>
<modules>
<!-- SLC framework -->
@@
-33,12
+31,12
@@
<!-- CMS extensions -->
<module>cms</module>
<!-- CMS extensions -->
<module>cms</module>
- <!-- Legacy -->
- <module>legacy</module>
-
<!-- Distribution -->
<module>dep</module>
<module>ide</module>
<!-- Distribution -->
<module>dep</module>
<module>ide</module>
+
+ <!-- Legacy -->
+ <module>legacy</module>
</modules>
<url>http://projects.argeo.org/slc/</url>
<scm>
</modules>
<url>http://projects.argeo.org/slc/</url>
<scm>