Improve Maven dependency structure

[lgpl/argeo-commons.git] / security / features / org.argeo.security.dep.node.rap / pom.xml

diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 8e93697bff7102f8218b49159ba4a605cb45b8ac..6fac5a061aec65a655bda280a14d9cd87bc25a12 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -8,16 +8,38 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.security.dep.node.rap</artifactId>
-       <name>Commons Node RAP Dependencies</name>
-       <packaging>jar</packaging>
-       <properties>
-               <version.rap>1.3.2</version.rap>
-       </properties>
+       <name>Node Eclipse RAP</name>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>resolve-pde-sources</id>
+                                               <goals>
+                                                       <goal>pde-sources</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>check-osgi</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>equinox</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <onlyCheck>true</onlyCheck>
+                                               </configuration>
+                                       </execution>
+                               </executions>
                        </plugin>
                </plugins>
        </build>
@@ -64,38 +86,6 @@
                        <id>rpmbuild</id>
                        <build>
                                <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-argeo-eclipse</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeGroupIds>org.argeo.commons.eclipse</includeGroupIds>
-                                                                       <excludeArtifactIds>org.argeo.eclipse.ui.rap</excludeArtifactIds>
-                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                                       <execution>
-                                                               <id>copy-direct</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <excludeArtifactIds>org.argeo.security.ui.rap,org.argeo.server.rap.webapp</excludeArtifactIds>
-                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -132,41 +122,6 @@
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
-                                                       <execution>
-                                                               <id>rpm-node-eclipse</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-node-eclipse</name>
-                                                                       <copyright>2011 Argeo</copyright>
-                                                                       <classifier>rpm-eclipse</classifier>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi/eclipse</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <dependency>
-                                                                                               <includes>
-                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui</include>
-                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.equinox</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.admin</include>
-                                                                                               </includes>
-                                                                                       </dependency>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/argeo-node-eclipse</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                               </configuration>
-                                                       </execution>
                                                </executions>
                                        </plugin>
                                        <plugin>
@@ -192,61 +147,5 @@
                                </plugins>
                        </build>
                </profile>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-rap</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds>
-                                                                       <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-rap</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>eclipse-rap</name>
-                                                                       <projversion>${version.rap}</projversion>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/eclipse-rap</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/eclipse-rap</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
        </profiles>
 </project>