You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/10/03 03:39:56 UTC

svn commit: r701275 - /myfaces/core/trunk_1.2.x/impl/pom.xml

Author: lu4242
Date: Thu Oct  2 18:39:56 2008
New Revision: 701275

URL: http://svn.apache.org/viewvc?rev=701275&view=rev
Log:
MYFACES-1976 Enhance build process, unpacking shared only when a release occur and use a dependency to shared instead

Modified:
    myfaces/core/trunk_1.2.x/impl/pom.xml

Modified: myfaces/core/trunk_1.2.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/pom.xml?rev=701275&r1=701274&r2=701275&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/pom.xml (original)
+++ myfaces/core/trunk_1.2.x/impl/pom.xml Thu Oct  2 18:39:56 2008
@@ -180,81 +180,110 @@
         </executions>
       </plugin>
                -->
-      <plugin>
-        <!--
-          - The shared-impl project generates a modified version of the "shared" module
-          - source and classes. The result is a jar full of files in the "shared_impl"
-          - package that we can merge into the jar for this project.
-          -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <id>unpack-shared-impl</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.myfaces.shared</groupId>
-                  <artifactId>myfaces-shared-impl</artifactId>
-                  <version>${myfaces-shared.version}</version>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}/classes</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack-shared-impl-sources</id>
-            <phase>process-sources</phase>
-            <goals>
-                <goal>unpack</goal>
-            </goals>
-            <configuration>
-                <artifactItems>
-                    <artifactItem>
-                        <groupId>org.apache.myfaces.shared</groupId>
-                        <artifactId>myfaces-shared-impl</artifactId>
-                        <version>${myfaces-shared.version}</version>
-                        <classifier>sources</classifier>
-                    </artifactItem>
-                </artifactItems>
-                <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!-- 
-          - Add the unpacked shared sources directory as source directory into the pom datastructure,
-          - so that the -source jar includes them too; every .class file in the jar should have its
-          - source in the -source jar.
-          -->  
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/shared_sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <profiles>
     <profile>
+        <id>add-shared-dependency</id>
+        <activation>
+            <property>
+                <name>!performRelease</name>
+            </property>
+        </activation>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.myfaces.shared</groupId>
+                <artifactId>myfaces-shared-impl</artifactId>
+                <version>${myfaces-shared.version}</version>
+                <scope>compile</scope>
+            </dependency>
+        </dependencies>
+    </profile>
+    <profile>
+        <id>unpack-shared</id>
+        <activation>
+            <property>
+                <name>performRelease</name>
+                <value>true</value>
+            </property>
+        </activation>
+        <build>
+            <plugins>
+              <plugin>
+                <!--
+                  - The shared-impl project generates a modified version of the "shared" module
+                  - source and classes. The result is a jar full of files in the "shared_impl"
+                  - package that we can merge into the jar for this project.
+                  -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                  <execution>
+                    <id>unpack-shared-impl</id>
+                    <phase>process-classes</phase>
+                    <goals>
+                      <goal>unpack</goal>
+                    </goals>
+                    <configuration>
+                      <artifactItems>
+                        <artifactItem>
+                          <groupId>org.apache.myfaces.shared</groupId>
+                          <artifactId>myfaces-shared-impl</artifactId>
+                          <version>${myfaces-shared.version}</version>
+                        </artifactItem>
+                      </artifactItems>
+                      <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                    </configuration>
+                  </execution>
+                  <execution>
+                    <id>unpack-shared-impl-sources</id>
+                    <phase>process-sources</phase>
+                    <goals>
+                        <goal>unpack</goal>
+                    </goals>
+                    <configuration>
+                        <artifactItems>
+                            <artifactItem>
+                                <groupId>org.apache.myfaces.shared</groupId>
+                                <artifactId>myfaces-shared-impl</artifactId>
+                                <version>${myfaces-shared.version}</version>
+                                <classifier>sources</classifier>
+                            </artifactItem>
+                        </artifactItems>
+                        <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
+                    </configuration>
+                  </execution>
+                </executions>
+              </plugin>
+              <plugin>
+                <!-- 
+                  - Add the unpacked shared sources directory as source directory into the pom datastructure,
+                  - so that the -source jar includes them too; every .class file in the jar should have its
+                  - source in the -source jar.
+                  -->  
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                  <execution>
+                    <id>add-source</id>
+                    <phase>process-sources</phase>
+                    <goals>
+                      <goal>add-source</goal>
+                    </goals>
+                    <configuration>
+                      <sources>
+                        <source>${project.build.directory}/shared_sources</source>
+                      </sources>
+                    </configuration>
+                  </execution>
+                </executions>
+              </plugin>
+            </plugins>
+        </build>
+    </profile>
+    <profile>
       <!--
         - Whenever the full website is generated, the command
         -   mvn -Pgenerate-site site