RPM build

git-svn-id: https://svn.argeo.org/commons/trunk@8709 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target b/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target
index 83bcddad08b1dc7863e1e2071f84cd9765f0971e..3e2209cf28efd92ccb2f8b5232d57833cf125798 100644 (file)
--- a/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target
+++ b/dep/org.argeo.dep.cms.client/org.argeo.dep.cms.client-maven.target
@@ -2,7 +2,6 @@
 <?pde version="3.6"?>
 <target name="org.argeo.dep.cms.client - Local Maven repository (v2.1.31-SNAPSHOT)">
 <locations>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.security.core/2.1.31-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.util/2.1.31-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.server.jcr/2.1.31-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/org.argeo.osgi.boot/2.1.31-SNAPSHOT" type="Directory"/>
@@ -90,7 +89,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/tp/apache/jackrabbit/org.apache.jackrabbit.jcr2spi.source/2.10.1" type="Directory"/>
 </locations>
 <includeBundles>
-<plugin id="org.argeo.security.core"/>
 <plugin id="org.argeo.util"/>
 <plugin id="org.argeo.server.jcr"/>
 <plugin id="org.argeo.osgi.boot"/>

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 0e154a8e2467245f574780bb1e57385117cc3a1c..ebfca54c02b92bcf0dfd6c337d1988526251de9e 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -15,7 +15,7 @@
                <!-- Argeo Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.core</artifactId>
+                       <artifactId>org.argeo.util</artifactId>
                        <version>2.1.31-SNAPSHOT</version>
                </dependency>
                <dependency>
@@ -220,11 +220,11 @@
                                                                </goals>
                                                                <configuration>
                                                                        <includeTypes>jar</includeTypes>
-                                                                       <stripVersion>true</stripVersion>
                                                                        <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
                                                                        <includeGroupIds>org.argeo.commons</includeGroupIds>
                                                                        <excludeTransitive>true</excludeTransitive>
                                                                        <includeTypes>jar</includeTypes>
+                                                                       <includeScope>runtime</includeScope>
                                                                </configuration>
                                                        </execution>
                                                        <execution>
@@ -235,11 +235,11 @@
                                                                </goals>
                                                                <configuration>
                                                                        <includeTypes>jar</includeTypes>
-                                                                       <stripVersion>true</stripVersion>
                                                                        <outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
                                                                        <excludeGroupIds>org.argeo.commons</excludeGroupIds>
                                                                        <excludeTransitive>true</excludeTransitive>
                                                                        <includeTypes>jar</includeTypes>
+                                                                       <includeScope>runtime</includeScope>
                                                                </configuration>
                                                        </execution>
                                                </executions>
@@ -274,7 +274,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <!-- <require>osgi-boot-equinox</require> -->
+                                                                               <require>argeo-cms-client-tp</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@ -325,5 +325,4 @@
                        </build>
                </profile>
        </profiles>
-
 </project>
\ No newline at end of file

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 84e8a7a9f09e48b0890732780844f29e79f06d15..db6698fdb864be92ac17bff1f8773344374b7e0f 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -30,6 +30,11 @@
                </dependency>
 
                <!-- Argeo Commons UI -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
@@ -236,4 +241,131 @@
                </dependency>
 
        </dependencies>
+
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+                                                                       <includeGroupIds>org.argeo.commons</includeGroupIds>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeScope>runtime</includeScope>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>copy-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+                                                                       <excludeGroupIds>org.argeo.commons</excludeGroupIds>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeScope>runtime</includeScope>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-cms-node</name>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <includes>
+                                                                                                               <include>*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-client</require>
+                                                                               <require>argeo-cms-node-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-cms-node-tp</name>
+                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/lib-tp</location>
+                                                                                                       <includes>
+                                                                                                               <include>*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-client-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 54510e2ba4d6b6fc39bbc6bd910b8d13eba6386b..611d6c2891379f0536e6c926afdedd0d586489e5 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -18,6 +18,11 @@
                        <artifactId>org.argeo.dep.cms.node</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.security.core</artifactId>
+                       <version>2.1.31-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.security.ui</artifactId>
@@ -167,4 +172,131 @@
                        <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
        </dependencies>
+
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+                                                                       <includeGroupIds>org.argeo.commons</includeGroupIds>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeScope>runtime</includeScope>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>copy-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+                                                                       <excludeGroupIds>org.argeo.commons</excludeGroupIds>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeScope>runtime</includeScope>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-cms-platform</name>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <includes>
+                                                                                                               <include>*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-node</require>
+                                                                               <require>argeo-cms-platform-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-cms-platform-tp</name>
+                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/lib-tp</location>
+                                                                                                       <includes>
+                                                                                                               <include>*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-node-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index b010e7024267a001e6b72c1da8f16ad4e1d7339a..b4b25a463647cf903b0e397f191de209f602d876 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -126,6 +126,7 @@
                                                                                        <filemode>644</filemode>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <dependency>
+                                                                                               <stripVersion>true</stripVersion>
                                                                                                <includes>
                                                                                                        <include>org.argeo.commons:org.argeo.osgi.boot</include>
                                                                                                </includes>
@@ -175,6 +176,7 @@
                                                                                        <filemode>644</filemode>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <dependency>
+                                                                                               <stripVersion>true</stripVersion>
                                                                                                <includes>
                                                                                                        <include>org.argeo.tp.equinox:org.eclipse.osgi</include>
                                                                                                </includes>

diff --git a/pom.xml b/pom.xml
index e445c204536793698e8edf063c76a82b8ca8a5f0..b7279058d1fbbecb6139005ae1e5b636f3503f17 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
                <version.argeo-distribution>2.1.12</version.argeo-distribution>
                <!-- RPM -->
-               <argeo.rpm.release>6</argeo.rpm.release>
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</argeo.rpm.stagingRepository>
+               <argeo.rpm.release>7</argeo.rpm.release>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
                <!-- encoding, see http://is.gd/mvn_source_encoding -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>