[infinispan-commits] Infinispan SVN: r112 - in trunk: parent and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: adriancole
Date: 2009-04-14 13:00:56 -0400 (Tue, 14 Apr 2009)
New Revision: 112

Modified:
   trunk/distribution/pom.xml
   trunk/parent/pom.xml
Log:
ISPN-52 used the <phase>none</phase> to disable plugins in distribution

Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml	2009-04-14 12:54:23 UTC (rev 111)
+++ trunk/distribution/pom.xml	2009-04-14 17:00:56 UTC (rev 112)
@@ -3,11 +3,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-
-   <properties>
-      <build-jars>false</build-jars>
-   </properties>
-
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
@@ -26,6 +21,26 @@
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>javadoc</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>build-test-jar</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
             <version>2.2-beta-1</version>
             <executions>

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml	2009-04-14 12:54:23 UTC (rev 111)
+++ trunk/parent/pom.xml	2009-04-14 17:00:56 UTC (rev 112)
@@ -66,7 +66,6 @@
     <project-package>org.infinispan</project-package>
     <project-version>4.0.0-SNAPSHOT</project-version>
     <defaultTestGroup>functional,unit</defaultTestGroup>
-    <build-jars>true</build-jars>
   </properties>
 
   <dependencies>
@@ -201,6 +200,55 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+        <executions>
+          <execution>
+            <id>javadoc</id>
+            <phase>package</phase>
+            <goals>
+              <goal>javadoc</goal>
+            </goals>
+            <configuration>
+              <links>
+                <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                <link>http://java.sun.com/javaee/5/docs/api/</link>
+              </links>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+         <archive>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <mainClass>org.infinispan.Version</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>build-test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <archive>
+                <manifest>
+                  <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                  <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                </manifest>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <finalName>${artifactId}</finalName>
   </build>
@@ -293,67 +341,5 @@
         <defaultTestGroup>transaction</defaultTestGroup>
       </properties>
     </profile>
-    <!-- only apply these plugins for modules who are of type jar -->
-    <profile>
-      <id>jarBuilder</id>
-      <activation>
-        <property>
-          <name>build-jars</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.5</version>
-            <executions>
-              <execution>
-                <phase>${javadocPhase}</phase>
-                <goals>
-                  <goal>javadoc</goal>
-                </goals>
-                <configuration>
-                  <links>
-                    <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                    <link>http://java.sun.com/javaee/5/docs/api/</link>
-                  </links>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <archive>
-                <manifest>
-                  <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                  <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                  <mainClass>org.infinispan.Version</mainClass>
-                </manifest>
-              </archive>
-            </configuration>
-            <executions>
-              <execution>
-                <id>build-test-jar</id>
-                <goals>
-                  <goal>test-jar</goal>
-                </goals>
-                <configuration>
-                  <archive>
-                    <manifest>
-                      <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                      <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                    </manifest>
-                  </archive>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>