Centralize MANIFEST clean

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

diff --git a/base/plugins/pom.xml b/base/plugins/pom.xml
index 2fc6ad5ef37f4a9302431cb3a8ba2fd71078c657..f8aad6515bbc43b5bd8dc2f777acfcd8f21d4b2b 100644 (file)
--- a/base/plugins/pom.xml
+++ b/base/plugins/pom.xml
@@ -28,10 +28,6 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>

diff --git a/base/runtime/pom.xml b/base/runtime/pom.xml
index 4162a2b7a8f8b73801563c1850d9ac1f5c6b6bd4..f8e0930b569857755848da64f897de5ab632421a 100644 (file)
--- a/base/runtime/pom.xml
+++ b/base/runtime/pom.xml
@@ -34,31 +34,6 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <configuration>
-                                       <filesets>
-                                               <fileset>
-                                                       <directory>META-INF</directory>
-                                                       <includes>
-                                                               <include>MANIFEST.MF</include>
-                                                       </includes>
-                                               </fileset>
-                                       </filesets>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index baf0c909559e234e91b57298185c016f8dde4e87..66523ef0268232f07a0d31606ede78f5bf09e320 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -169,6 +169,10 @@ limitations under the License.
                                                <autoVersionSubmodules>true</autoVersionSubmodules>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-javadoc-plugin</artifactId>
+                                       <version>2.8.1</version>
+                               </plugin>
                                <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
@@ -351,6 +355,25 @@ limitations under the License.
                                        <timestampFormat>yyMMdd_HHmm</timestampFormat>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <configuration>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <skip>true</skip>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>

diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index da6f511edeb929e2e8b54a8e7cd2709a412bcd61..da264efc5735e905701aec5c21bfa68ca1f9adb3 100644 (file)
--- a/security/modules/pom.xml
+++ b/security/modules/pom.xml
@@ -31,23 +31,6 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <configuration>
-                                       <filesets>
-                                               <fileset>
-                                                       <directory>META-INF</directory>
-                                                       <includes>
-                                                               <include>MANIFEST.MF</include>
-                                                       </includes>
-                                               </fileset>
-                                       </filesets>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index 73b9300231118d250ac8ad95be55b92d8dd6f900..9ef2a6d4247f04506e8b67f8758ff3866a0ce605 100644 (file)
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -35,23 +35,6 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <configuration>
-                                       <filesets>
-                                               <fileset>
-                                                       <directory>META-INF</directory>
-                                                       <includes>
-                                                               <include>MANIFEST.MF</include>
-                                                       </includes>
-                                               </fileset>
-                                       </filesets>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
@@ -63,10 +46,6 @@
                                        </excludes>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
@@ -78,12 +57,4 @@
                        </plugin>
                </plugins>
        </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.base</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>1.1.5-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
 </project>
\ No newline at end of file

diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 103801c34261733b1e006389a6f14ba80e7d4a18..94ac6083bf73b24fbffe52e02ee9559281afa268 100644 (file)
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -30,31 +30,6 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <configuration>
-                                       <filesets>
-                                               <fileset>
-                                                       <directory>META-INF</directory>
-                                                       <includes>
-                                                               <include>MANIFEST.MF</include>
-                                                       </includes>
-                                               </fileset>
-                                       </filesets>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index 21cdd1fc0dedf7fdc8fd064312d276a1137bf262..3c93c4e9cd0d2afa5367871bf0f3da8a33971b57 100644 (file)
--- a/server/modules/pom.xml
+++ b/server/modules/pom.xml
@@ -42,31 +42,9 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <configuration>
-                                       <filesets>
-                                               <fileset>
-                                                       <directory>META-INF</directory>
-                                                       <includes>
-                                                               <include>MANIFEST.MF</include>
-                                                       </includes>
-                                               </fileset>
-                                       </filesets>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package />
-                                       </instructions>
-                               </configuration>
                        </plugin>
                </plugins>
        </build>

diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index 0d4cab19d07d83f24b341c48b3ff3b83e18f535e..a2808db0111c49f652a86287c3e478cd40685fdd 100644 (file)
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -32,10 +32,6 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
@@ -47,10 +43,6 @@
                                        </excludes>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index ef7aed5b80659a13ae06aac561ea10d32ea6e96a..8f6df44f36ca2cb4ea62c40aa58b1877022b0c2f 100644 (file)
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -36,35 +36,9 @@
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <configuration>
-                                       <filesets>
-                                               <fileset>
-                                                       <directory>META-INF</directory>
-                                                       <includes>
-                                                               <include>MANIFEST.MF</include>
-                                                       </includes>
-                                               </fileset>
-                                       </filesets>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
                        </plugin>
                </plugins>
        </build>