myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1071461 - in /myfaces/extensions/cdi/trunk: core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java pom.xml
Date Thu, 17 Feb 2011 00:43:35 GMT
Author: gpetracek
Date: Thu Feb 17 00:43:35 2011
New Revision: 1071461

URL: http://svn.apache.org/viewvc?rev=1071461&view=rev
Log:
minor changes

Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
    myfaces/extensions/cdi/trunk/pom.xml

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java?rev=1071461&r1=1071460&r2=1071461&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
(original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
Thu Feb 17 00:43:35 2011
@@ -186,16 +186,23 @@ public class CoreStartupObserver extends
 
     public String getCodiCoreInformation()
     {
-        if(CodiInformation.VERSION != null && !CodiInformation.VERSION.startsWith("null"))
+        String version = CodiInformation.VERSION;
+        String revision;
+
+        if(version != null && !version.startsWith("null"))
         {
-            String revision = "";
-            if(CodiInformation.VERSION.endsWith("-SNAPSHOT") &&
-                    CodiInformation.REVISION != null && !CodiInformation.REVISION.startsWith("null"))
+            revision = CodiInformation.REVISION;
+
+            if(version.endsWith("-SNAPSHOT") && revision != null && !revision.startsWith("null"))
+            {
+                version = version.replace("-SNAPSHOT", " r");
+            }
+            else
             {
-                revision = " r" + CodiInformation.REVISION;
+                revision = "";
             }
 
-            return " v" + CodiInformation.VERSION + revision;
+            return " v" + version + revision;
         }
         return "";
     }

Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=1071461&r1=1071460&r2=1071461&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Thu Feb 17 00:43:35 2011
@@ -605,6 +605,7 @@
                             <doUpdate>false</doUpdate>
                             <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
                             <buildNumberPropertyName>scm.revision</buildNumberPropertyName>
+                            <!--revisionOnScmFailure>unknown</revisionOnScmFailure-->
                         </configuration>
                     </plugin>
                 </plugins>



Mime
View raw message