Centralize resources definition

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

diff --git a/base/dep/pom.xml b/base/dep/pom.xml
index f6330a237f86ed82de2c9267f60a4ee3436d6a1f..4489dced7b46f7874a02e714b4151aa3f35cc38b 100644 (file)
--- a/base/dep/pom.xml
+++ b/base/dep/pom.xml
@@ -18,25 +18,7 @@
                <module>org.argeo.eclipse.dep.rcp</module>
        </modules>
        <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>*.inf</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>buildnumber-maven-plugin</artifactId>
-                               <configuration>
-                                       <useLastCommittedRevision>false</useLastCommittedRevision>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/base/plugins/pom.xml b/base/plugins/pom.xml
index f8aad6515bbc43b5bd8dc2f777acfcd8f21d4b2b..9441e1e58e965494f470a7cbe4991f207c9584fa 100644 (file)
--- a/base/plugins/pom.xml
+++ b/base/plugins/pom.xml
@@ -14,20 +14,16 @@
                <module>org.argeo.osgi.ui.explorer</module>
        </modules>
        <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>plugin.xml</include>
-                                       <include>META-INF/**</include>
-                                       <include>icons/**</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
@@ -39,15 +35,6 @@
                                        </excludes>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
 </project>

diff --git a/base/runtime/pom.xml b/base/runtime/pom.xml
index 51a48cdc60762b9ef58c24f85c416eefdd81ca49..099970b9abae05052acb41d86c657bb523e72478 100644 (file)
--- a/base/runtime/pom.xml
+++ b/base/runtime/pom.xml
@@ -19,19 +19,4 @@
                <module>org.argeo.eclipse.ui.rcp</module>
                <module>org.argeo.eclipse.ui.jcr</module>
        </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>plugin.xml</include>
-                                       <include>META-INF/**</include>
-                                       <include>icons/**</include>
-                               </includes>
-                       </resource>
-               </resources>
-       </build>
 </project>

diff --git a/pom.xml b/pom.xml
index 66523ef0268232f07a0d31606ede78f5bf09e320..240af13a3b44f37a0b296b8637318a26c57f032d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,26 @@ limitations under the License.
                                </plugin>
                        </plugins>
                </pluginManagement>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>plugin.xml</include>
+                                       <include>META-INF/**</include>
+                                       <include>WEB-INF/**</include>
+                                       <include>icons/**</include>
+                                       <include>branding/**</include>
+                                       <include>*.properties</include>
+                                       <include>p2.inf</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>

diff --git a/security/dep/pom.xml b/security/dep/pom.xml
index d9241f43a1187f5340eca9898cb7b04a956fe8a6..68339e7511b0e9656f0dc1959b0fdf323dfbdcd4 100644 (file)
--- a/security/dep/pom.xml
+++ b/security/dep/pom.xml
@@ -18,14 +18,6 @@
                <module>org.argeo.security.dep.node.rcp</module>
        </modules>
        <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>*.inf</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.apache.felix</groupId>

diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index d469f8506cf6f68652da4a2b2e6194faa636a94c..95074346a6b9fb33c1d028c3173d28cf495f5dcc 100644 (file)
--- a/security/modules/pom.xml
+++ b/security/modules/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -25,6 +26,7 @@
                                </includes>
                                <excludes>
                                        <exclude>.*</exclude>
+                                       <exclude>.*/**</exclude>
                                        <exclude>pom.xml</exclude>
                                        <exclude>build.properties</exclude>
                                </excludes>

diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index 9ef2a6d4247f04506e8b67f8758ff3866a0ce605..45d76c7b1953dab27356c6953edea1d670ab3bcf 100644 (file)
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -18,23 +18,16 @@
                <module>org.argeo.security.ui.rap</module>
        </modules>
        <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>plugin.xml</include>
-                                       <include>security*.properties</include>
-                                       <include>plugin.properties</include>
-                                       <include>META-INF/**</include>
-                                       <include>branding/**</include>
-                                       <include>icons/**</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
@@ -46,15 +39,6 @@
                                        </excludes>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
 </project>
\ No newline at end of file

diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 17a957d79eeedd83e0280aaeb47d1b015a0e912b..b7e3f099490ade0d75228fff6cda5ca499ee54e9 100644 (file)
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -17,17 +17,4 @@
                <module>org.argeo.security.activemq</module>
                <module>org.argeo.security.jackrabbit</module>
        </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
-       </build>
 </project>
\ No newline at end of file

diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index a2808db0111c49f652a86287c3e478cd40685fdd..baeeaa2e01ce627a4b7cef892257cc6332783674 100644 (file)
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -15,22 +15,6 @@
                <module>org.argeo.jcr.ui.explorer</module>
        </modules>
        <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>plugin.xml</include>
-                                       <include>META-INF/**</include>
-                                       <include>icons/**</include>
-                                       <include>plugin.properties</include>
-                                       <!-- Specific -->
-                                       <include>jcrexplorer.properties</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>

diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index 9f394401e2bf61cdcac52d8290b40a462f17c732..c4e64753897cacd843b92e2fce24f28c73307ed8 100644 (file)
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -23,17 +23,4 @@
                <module>org.argeo.server.jackrabbit</module>
                <module>org.argeo.server.modeshape</module>
        </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
-       </build>
 </project>
\ No newline at end of file