You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2011/02/16 00:46:47 UTC

svn commit: r1071110 - /myfaces/trinidad/tags/trinidad-2.0.0-beta-2/trinidad-api/pom.xml

Author: sobryan
Date: Tue Feb 15 23:46:46 2011
New Revision: 1071110

URL: http://svn.apache.org/viewvc?rev=1071110&view=rev
Log:
TRINIDAD-2037: Unable to build from source archive

* Added a new "extended-manifest" profile which will now include revision information in the manifest
* Revision information is no longer included in the manifest by default

Modified:
    myfaces/trinidad/tags/trinidad-2.0.0-beta-2/trinidad-api/pom.xml

Modified: myfaces/trinidad/tags/trinidad-2.0.0-beta-2/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/tags/trinidad-2.0.0-beta-2/trinidad-api/pom.xml?rev=1071110&r1=1071109&r2=1071110&view=diff
==============================================================================
--- myfaces/trinidad/tags/trinidad-2.0.0-beta-2/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/tags/trinidad-2.0.0-beta-2/trinidad-api/pom.xml Tue Feb 15 23:46:46 2011
@@ -169,29 +169,6 @@
         </executions>
       </plugin>
 
-      <!-- 
-          To make the current revision number, we use the buildnumber-maven-plugin.
-      -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>buildnumber-maven-plugin</artifactId>
-        <version>1.0-beta-4</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>create</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <doCheck>false</doCheck>
-          <doUpdate>false</doUpdate>
-          <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
-          <buildNumberPropertyName>scm.revision</buildNumberPropertyName>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -202,7 +179,6 @@
              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
            </manifest>
            <manifestEntries>
-             <Revision>${scm.revision}</Revision>
              <Maven-Version>${maven.version}</Maven-Version>
              <Java-Vendor>${java.vendor}</Java-Vendor>
              <Os-Name>${os.name}</Os-Name>
@@ -380,5 +356,48 @@
         </plugins>
       </build>
     </profile>
+    
+    <!-- This adds further debugging information to the manifest.  Currently this is the svn revision number of the build.  -->
+    <profile>
+      <id>extended-manifest</id>
+      
+      <build>
+        <plugins>
+          <!-- 
+            To make the current revision number, we use the buildnumber-maven-plugin.
+          -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>buildnumber-maven-plugin</artifactId>
+            <version>1.0-beta-4</version>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <goals>
+                  <goal>create</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <doCheck>false</doCheck>
+              <doUpdate>false</doUpdate>
+              <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+              <buildNumberPropertyName>scm.revision</buildNumberPropertyName>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Revision>${scm.revision}</Revision>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>