Move to the root the bundles which will be part of v1.4 and v2.2

[lgpl/argeo-commons.git] / security / dep / pom.xml

diff --git a/security/dep/pom.xml b/security/dep/pom.xml
index 85d14da0959e9919c076fdaa4aef9e3182cbd397..21884a008578a6eb4d3c42c3fad957cae89454ef 100644 (file)
--- a/security/dep/pom.xml
+++ b/security/dep/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
-               <version>0.3.4-SNAPSHOT</version>
+               <version>2.1.12-SNAPSHOT</version>
                <artifactId>security</artifactId>
                <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.commons.security</groupId>
+       <groupId>org.argeo.commons</groupId>
        <artifactId>dep</artifactId>
        <name>Commons Security Features</name>
        <packaging>pom</packaging>
@@ -19,18 +18,7 @@
                <module>org.argeo.security.dep.node.rcp</module>
        </modules>
        <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>*.inf</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
@@ -52,10 +40,8 @@
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true"
-                                                                                       failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>