brett 2004/10/30 18:01:56
Modified: . Tag: MAVEN-1_0-BRANCH maven.xml project.xml
src/conf Tag: MAVEN-1_0-BRANCH driver.properties
src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenSession.java
src/java/org/apache/maven/cli Tag: MAVEN-1_0-BRANCH App.java
Log:
filter version in from project.xml
Revision Changes Path
No revision
No revision
1.97.2.32 +4 -0 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.97.2.31
retrieving revision 1.97.2.32
diff -u -r1.97.2.31 -r1.97.2.32
--- maven.xml 7 Jul 2004 10:35:35 -0000 1.97.2.31
+++ maven.xml 31 Oct 2004 01:01:55 -0000 1.97.2.32
@@ -22,6 +22,10 @@
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven">
+ <preGoal name="java:jar-resources">
+ <ant:filter token="pom.currentVersion" value="${pom.currentVersion}" />
+ </preGoal>
+
<goal name="maven:init">
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
1.317.4.36 +7 -1 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.317.4.35
retrieving revision 1.317.4.36
diff -u -r1.317.4.35 -r1.317.4.36
--- project.xml 28 Oct 2004 10:11:44 -0000 1.317.4.35
+++ project.xml 31 Oct 2004 01:01:55 -0000 1.317.4.36
@@ -779,10 +779,16 @@
<include>*.xsd</include>
<include>*.dtd</include>
<include>*.mod</include>
- <include>*.properties</include>
<include>driver.jelly</include>
<include>LICENCE.txt</include>
</includes>
+ </resource>
+ <resource>
+ <directory>src/conf</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>src/messages</directory>
No revision
No revision
1.7.10.2 +1 -0 maven/src/conf/driver.properties
Index: driver.properties
===================================================================
RCS file: /home/cvs/maven/src/conf/driver.properties,v
retrieving revision 1.7.10.1
retrieving revision 1.7.10.2
diff -u -r1.7.10.1 -r1.7.10.2
--- driver.properties 4 Mar 2004 17:47:31 -0000 1.7.10.1
+++ driver.properties 31 Oct 2004 01:01:55 -0000 1.7.10.2
@@ -27,3 +27,4 @@
# -------------------------------------------------------------------
maven.defaults.loaded = true
+maven.application.version = @pom.currentVersion@
No revision
No revision
1.18.4.17 +1 -4 maven/src/java/org/apache/maven/MavenSession.java
Index: MavenSession.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenSession.java,v
retrieving revision 1.18.4.16
retrieving revision 1.18.4.17
diff -u -r1.18.4.16 -r1.18.4.17
--- MavenSession.java 28 Aug 2004 08:08:14 -0000 1.18.4.16
+++ MavenSession.java 31 Oct 2004 01:01:56 -0000 1.18.4.17
@@ -61,9 +61,6 @@
/** Initialization jellyscript name. */
public static final String DRIVER_SCRIPT_NAME = "driver.jelly";
- /** The current MavenSession version id */
- public static final String APP_VERSION = "1.0.1-SNAPSHOT";
-
// ------------------------------------------------------------
// C L A S S M E M B E R S
// ------------------------------------------------------------
No revision
No revision
1.37.4.29 +18 -2 maven/src/java/org/apache/maven/cli/App.java
Index: App.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/cli/App.java,v
retrieving revision 1.37.4.28
retrieving revision 1.37.4.29
diff -u -r1.37.4.28 -r1.37.4.29
--- App.java 30 Oct 2004 09:31:49 -0000 1.37.4.28
+++ App.java 31 Oct 2004 01:01:56 -0000 1.37.4.29
@@ -44,6 +44,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -893,10 +894,25 @@
*/
protected void printConsoleMavenHeader()
{
+ Properties p = new Properties();
+ InputStream is = getClass().getResourceAsStream( "/driver.properties" );
+ try
+ {
+ p.load( is );
+ }
+ catch ( IOException e )
+ {
+ log.error( "[Unable to load driver properties: " + e );
+ }
+ finally
+ {
+ try { is.close(); } catch ( IOException e ) {}
+ }
+
log.info( " __ __" );
log.info( "| \\/ |__ _Apache__ ___" );
log.info( "| |\\/| / _` \\ V / -_) ' \\ ~ intelligent projects ~" );
- log.info( "|_| |_\\__,_|\\_/\\___|_||_| v. " +
org.apache.maven.MavenSession.APP_VERSION );
+ log.info( "|_| |_\\__,_|\\_/\\___|_||_| v. " + p.getProperty(
"maven.application.version" ) );
log.info( "" );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
