svn commit: r728933 - in /maven/components/branches/maven-2.1.x/maven-core: pom.xml src/main/java/org/apache/maven/cli/MavenCli.java src/test/java/org/apache/maven/cli/MavenCliTest.java

[brett]

Author: brett
Date: Tue Dec 23 03:51:55 2008
New Revision: 728933

URL: http://svn.apache.org/viewvc?rev=728933&view=rev
Log:
restore filtering taken out in the earlier merge, required for version 
handling. Add unit test to verify population

Modified:
    maven/components/branches/maven-2.1.x/maven-core/pom.xml
    
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
    
maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java

Modified: maven/components/branches/maven-2.1.x/maven-core/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/pom.xml?rev=728933&r1=728932&r2=728933&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core/pom.xml Tue Dec 23 
03:51:55 2008
@@ -161,6 +161,15 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+
   <reporting>
     <plugins>
       <plugin>

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=728933&r1=728932&r2=728933&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
 Tue Dec 23 03:51:55 2008
@@ -576,13 +576,9 @@
         return localRepository;
     }
 
-    private static void showVersion()
+    public static Properties getBuildProperties()
     {
         Properties properties = new Properties();
-        String timestamp = null;
-        String rev = null;
-        String version = null;
-
         InputStream resourceAsStream = null;
         try
         {
@@ -591,10 +587,6 @@
             if ( resourceAsStream != null )
             {
                 properties.load( resourceAsStream );
-
-                timestamp = reduce( properties.getProperty( "timestamp" ) );
-                version = reduce( properties.getProperty( "version" ) );
-                rev = reduce( properties.getProperty( "buildNumber" ) );
             }
         }
         catch ( IOException e )
@@ -606,6 +598,17 @@
             IOUtil.close( resourceAsStream );
         }
 
+        return properties;
+    }
+
+    private static void showVersion()
+    {
+        Properties properties = getBuildProperties();
+
+        String timestamp = reduce( properties.getProperty( "timestamp" ) );
+        String version = reduce( properties.getProperty( "version" ) );
+        String rev = reduce( properties.getProperty( "buildNumber" ) );
+
         String msg = "Apache Maven ";
         msg += ( version != null ? version : "<version unknown>" );
         if ( rev != null || timestamp != null )

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java?rev=728933&r1=728932&r2=728933&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
 Tue Dec 23 03:51:55 2008
@@ -114,4 +114,17 @@
         // sys props should override cmdline props
         //assertEquals( "2.0", p.getProperty( "test.property.2" ) );
     }
+
+    public void testGetBuildProperties()
+        throws Exception
+    {
+        Properties properties = MavenCli.getBuildProperties();
+
+        assertNotNull( properties.getProperty( "version" ) );
+        assertNotNull( properties.getProperty( "buildNumber" ) );
+        assertNotNull( properties.getProperty( "timestamp" ) );
+        assertFalse( properties.getProperty( "version" ).equals( 
"${project.version}" ) );
+        assertFalse( properties.getProperty( "buildNumber" ).equals( 
"${buildNumber}" ) );
+        assertFalse( properties.getProperty( "timestamp" ).equals( 
"${timestamp}" ) );
+    }
 }