Revert to previous version of RPM Maven plugin

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

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 7c67df4f7d66f1436d0105ae660735906e34abe9..002e07546866eacd5183ffa7d2ab41fcc4a044dd 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -10,6 +10,9 @@
        <artifactId>osgi-boot</artifactId>
        <packaging>pom</packaging>
        <name>Commons OSGi Boot Distribution</name>
+       <properties>
+               <version.equinox>3.9.1.v20140110-1610</version.equinox>
+       </properties>
        <profiles>
                <profile>
                        <id>rpmbuild</id>
@@ -23,7 +26,7 @@
                                                                <id>copy-dependencies</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>copy</goal>
                                                                </goals>
                                                                <configuration>
                                                                        <includeTypes>jar</includeTypes>
@@ -33,7 +36,13 @@
                                                                                <artifactItem>
                                                                                        <groupId>org.argeo.commons</groupId>
                                                                                        <artifactId>org.argeo.osgi.boot</artifactId>
-                                                                                       <version>2.1.12-SNAPSHOT</version>
+                                                                                       <version>${version.argeo-commons}</version>
+                                                                                       <type>jar</type>
+                                                                               </artifactItem>
+                                                                               <artifactItem>
+                                                                                       <groupId>org.argeo.tp.equinox</groupId>
+                                                                                       <artifactId>org.eclipse.osgi</artifactId>
+                                                                                       <version>${version.equinox}</version>
                                                                                        <type>jar</type>
                                                                                </artifactItem>
                                                                        </artifactItems>

diff --git a/pom.xml b/pom.xml
index 7dca9a4b6db44a676f4c14653ca95c431620b1b0..51dcc4409458692e8006c2cb794b3f1159668090 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -257,10 +257,12 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1</version>
+                                       <version>2.1-alpha-1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
+                                               <release>1.el${rpm.release}</release>
+                                               <distribution>argeo${rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
                                        </configuration>