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.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index b533a069ec92d82ae4c2a0bdbb8d6762e32d4976..e8d2e7d3d5718b99e4cd99f184d1d45de2fb85fa 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -98,8 +98,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <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>

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 276d1fa08d82face21a827eef8c00835c94025df..b4ffde343bfb97e8e41d41c71f5ec79b4de071dc 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -254,8 +254,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-slc${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -318,7 +316,7 @@
                                                                <configuration>
                                                                        <name>argeo-slc-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

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 20d0824da68fcc4b52d96bb3ce5866d6857ff30b..49af3e978c94ccd2752a69e3b2ea8a796e4a3e1f 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
@@ -300,7 +300,7 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-platform${argeo.rpm.suffix}</name>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <version>${project.version}</version>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -363,7 +363,7 @@
                                                                <configuration>
                                                                        <name>argeo-cms-platform-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/legacy/dep/org.argeo.slc.dep.backend/pom.xml b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
index 0e6de0980b3199cbefb27a8b5254ff94ee5bfc3c..3e60b553e19aedf97f22b8cb476678c995c5406d 100644 (file)
--- a/legacy/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
@@ -124,8 +124,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-slc-platform${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/legacy/dep/org.argeo.slc.dep.spring/pom.xml b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
index e0bb73d26d53fa6b465e71bcc37a26f5e8c69f3f..06856957cd6155283cd9becb4b92e90580fc9702 100644 (file)
--- a/legacy/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
@@ -193,8 +193,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-slc-spring${argeo.rpm.suffix}</name>
-                                                                       <projversion>${version.released}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -259,7 +257,7 @@
                                                                <configuration>
                                                                        <name>argeo-slc-spring-tp${argeo.rpm.suffix}</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
-                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <release>${argeo.rpm.release.tp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>

diff --git a/legacy/pom.xml b/legacy/pom.xml
index 23ccdaa4163d04e9ce3ad2d024e0c2cae2d35951..6d2a4504ae2a34a7dfe77ba5b8f7a49d057e8516 100644 (file)
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -68,116 +68,4 @@
                        </exclusions>
                </dependency>
        </dependencies>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp</groupId>
-                               <artifactId>argeo-tp</artifactId>
-                               <version>${version.argeo-tp}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp</groupId>
-                               <artifactId>argeo-tp-rap-e4</artifactId>
-                               <version>${version.argeo-tp}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.extras</groupId>
-                               <artifactId>argeo-tp-extras</artifactId>
-                               <version>${version.argeo-tp-extras}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <repositories>
-               <repository>
-                       <id>argeo</id>
-                       <url>http://forge.argeo.org/data/java/argeo-2.1/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-               <repository>
-                       <id>argeo-extras</id>
-                       <url>http://forge.argeo.org/data/java/argeo-extras-2.1/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-       </repositories>
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                               <version>2.9</version>
-                               <reportSets>
-                                       <reportSet>
-                                               <reports>
-                                                       <report>index</report>
-                                                       <report>summary</report>
-                                                       <report>license</report>
-                                                       <report>scm</report>
-                                               </reports>
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.0.0</version>
-                               <configuration>
-                                       <failOnError>false</failOnError>
-                                       <additionalJOption>-Xdoclint:none</additionalJOption>
-                                       <excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
-                                       <encoding>UTF-8</encoding>
-                                       <detectLinks>true</detectLinks>
-                                       <links>
-                                               <link>http://docs.oracle.com/javase/8/docs/api</link>
-                                               <link>https://osgi.org/javadoc/r5/core</link>
-                                               <link>https://osgi.org/javadoc/r5/enterprise</link>
-                                               <link>https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0</link>
-                                               <link>http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api</link>
-                                               <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
-                                       </links>
-                               </configuration>
-                               <reportSets>
-                                       <reportSet>
-                                               <id>aggregate-javadoc</id>
-                                               <inherited>false</inherited>
-                                               <reports>
-                                                       <report>aggregate</report>
-                                               </reports>
-                                       </reportSet>
-                                       <reportSet>
-                                               <id>javadoc</id>
-                                               <reports />
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-jxr-plugin</artifactId>
-                               <version>2.5</version>
-                               <reportSets>
-                                       <reportSet>
-                                               <id>aggregate-jxr</id>
-                                               <inherited>false</inherited>
-                                               <reports>
-                                                       <report>aggregate</report>
-                                               </reports>
-                                       </reportSet>
-                                       <reportSet>
-                                               <id>jxr</id>
-                                               <reports />
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
-               </plugins>
-       </reporting>
 </project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 3f58490124342cd2ead588c1e5c83166f4400ce1..9085ec70070221ec27ccd791d970d9061cbe8811 100644 (file)
--- a/pom.xml
+++ b/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.slc</groupId>
        <artifactId>argeo-slc</artifactId>
@@ -159,20 +159,4 @@
                        <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
                </site>
        </distributionManagement>
-       <profiles>
-               <profile>
-                       <id>localrepo</id>
-                       <repositories>
-                               <repository>
-                                       <id>argeo-extras</id>
-                                       <url>http://localhost:7080/data/java/argeo-extras-2.3</url>
-                                       <releases>
-                                               <enabled>true</enabled>
-                                               <updatePolicy>daily</updatePolicy>
-                                               <checksumPolicy>warn</checksumPolicy>
-                                       </releases>
-                               </repository>
-                       </repositories>
-               </profile>
-       </profiles>
 </project>