Author: brett
Date: Tue Dec 23 03:54:22 2008
New Revision: 728934
URL: http://svn.apache.org/viewvc?rev=728934&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.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.0.x/maven-core/pom.xml
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props
changed)
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props
changed)
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 03:54:22 2008
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933
/maven/components/trunk:720001,721902,726845
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 03:54:22 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
-/maven/components/branches/maven-2.1.x/apache-maven:720038
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 03:54:22 2008
@@ -1 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933
Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=728934&r1=728933&r2=728934&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Tue Dec 23
03:54:22 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.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=728934&r1=728933&r2=728934&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Tue Dec 23 03:54:22 2008
@@ -547,13 +547,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
{
@@ -562,10 +558,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 )
@@ -577,6 +569,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.0.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java?rev=728934&r1=728933&r2=728934&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
Tue Dec 23 03:54:22 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}" ) );
+ }
}
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 03:54:22 2008
@@ -1 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 03:54:22 2008
@@ -1 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933
