Improve RPM build.

diff --git a/cnf/maven.bnd b/cnf/maven.bnd
index bbd72adec484781db9ddb623f71d54adb067194d..a90b48b29012536989449e17248bc157e947e99a 100644 (file)
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@ -1,3 +1,4 @@
 -include: \
 ../cnf/unstable.bnd, \
-../cnf/argeo.bnd
+../cnf/argeo.bnd, \
+-../cnf/release.bnd

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index f52536231419fad80da93381703134cf37bf644f..b4c4229fbcab48674441b8aebc1618c802ed81dc 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
@@ -21,60 +21,12 @@
                        <type>pom</type>
                </dependency>
 
-               <!-- Jackson JSON processor -->
                <dependency>
-                       <groupId>org.argeo.tp.jackson</groupId>
-                       <artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jackson</groupId>
-                       <artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jackson</groupId>
-                       <artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
-               </dependency>
-
-               <!-- POI requirements -->
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.math3</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.collections4</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xml.security</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xmlbeans</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xalan</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xalan.serializer</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xml.resolver</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xerces</artifactId>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ext</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
                </dependency>
-
-               <!-- Argeo TP Extras -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.payment</groupId> -->
-<!--                   <artifactId>com.stripe</artifactId> -->
-<!--           </dependency> -->
-
        </dependencies>
        <profiles>
                <profile>
@@ -130,7 +82,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-e4-rcp</name>
+                                                                       <name>argeo-suite-e4-rcp${argeo.rpm.suffix}</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index 802b271ad1a7ae0c3368cf35f8b5ab0985bb52ff..5c8017bcc7372abfd623c7258f55ac17c17b5842 100644 (file)
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -11,6 +11,20 @@
        <name>Suite Platform UI RAP</name>
        <packaging>jar</packaging>
        <dependencies>
+               <!-- Base CMS distribution -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ext</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+
                <!-- Entity Framework -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
@@ -102,26 +116,6 @@
                        <version>2.3-SNAPSHOT</version>
                </dependency>
 
-               <!-- Additional Third Parties -->
-               <dependency>
-                       <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.xml.bind</artifactId>
-               </dependency>
-
-               <!-- Jackson JSON processor -->
-               <dependency>
-                       <groupId>org.argeo.tp.jackson</groupId>
-                       <artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jackson</groupId>
-                       <artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jackson</groupId>
-                       <artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
-               </dependency>
-
                <!-- PDFBox -->
                <dependency>
                        <groupId>org.argeo.tp.apache</groupId>
@@ -136,40 +130,6 @@
                        <artifactId>org.apache.pdfbox.jempbox</artifactId>
                </dependency>
 
-               <!-- POI requirements -->
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.math3</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.collections4</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xml.security</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xmlbeans</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xalan</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xalan.serializer</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xml.resolver</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.xerces</artifactId>
-               </dependency>
-
                <!-- POI (MS office documents) -->
                <dependency>
                        <groupId>org.argeo.tp.apache</groupId>
@@ -187,31 +147,6 @@
                        <groupId>org.argeo.tp.apache</groupId>
                        <artifactId>org.apache.poi.scratchpad</artifactId>
                </dependency>
-
-               <!-- Mail -->
-               <dependency>
-                       <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.activation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.mail</artifactId>
-               </dependency>
-
-               <!-- Base CMS distribution -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Argeo TP Extras -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.payment</groupId> -->
-               <!-- <artifactId>com.stripe</artifactId> -->
-               <!-- </dependency> -->
-
        </dependencies>
        <profiles>
                <profile>
@@ -246,7 +181,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-ui-rap-unstable</name>
+                                                                       <name>argeo-suite-ui-rap${argeo.rpm.suffix}</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -307,9 +242,9 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-ui-rap-tp-unstable</name>
+                                                                       <name>argeo-suite-ui-rap-tp${argeo.rpm.suffix}</name>
                                                                        <version>${version.argeo-tp}</version>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/dep/pom.xml b/dep/pom.xml
index 8d62610ee9d610db54d7d4e45fda1b19ffea0ac7..3ab1a19359623070f716bb51ad7cf73c2d49f608 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -19,6 +19,16 @@
        </modules>
        <build>
                <plugins>
+                       <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.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
index efa3a027469959194b6f6407a9ca9dd0327cb735..f418fac7c957decd99d57a37a76fc6e34317a6b5 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.4</version>
+               <version>2.1.5-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite-lib</artifactId>
@@ -14,7 +14,6 @@
        <properties>
                <!-- Dependencies -->
                <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-suite-icons>2.1.1</version.argeo-suite-icons>
 

diff --git a/pom.xml b/pom.xml
index 91e7ac7e6b60449f05970d0d8b755da45371556e..678e546c15cd0eab3c4512a52198e6bbe662085e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.4</version>
+               <version>2.1.5-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
@@ -14,9 +14,9 @@
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
+               <version.context>unstable</version.context>
                <!-- Dependencies -->
                <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-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
                <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>