brett 2004/01/06 00:25:22
Modified: maven-model-tools project.xml
maven-model-tools/src/java/org/apache/maven/model
DefaultModelUnmarshaller.java
Log:
more deprecation warnings
Revision Changes Path
1.8 +1 -1 maven-components/maven-model-tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-model-tools/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 Dec 2003 04:55:18 -0000 1.7
+++ project.xml 6 Jan 2004 08:25:22 -0000 1.8
@@ -34,7 +34,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0-alpha-2</version>
+ <version>2.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
1.10 +17 -1
maven-components/maven-model-tools/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java
Index: DefaultModelUnmarshaller.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-tools/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultModelUnmarshaller.java 28 Dec 2003 23:19:19 -0000 1.9
+++ DefaultModelUnmarshaller.java 6 Jan 2004 08:25:22 -0000 1.10
@@ -49,10 +49,23 @@
{
project.setExtend( parser.nextText() );
}
+ else if ( parser.getName().equals( "pomVersion" ) )
+ {
+ // TODO: localization, logging?
+ // TODO: warning here, or in model? what about location of
version differences? Separate implementations of this class?
+ System.err.println( "DEPRECATED: please use <modelVersion>
instead of <pomVersion>" );
+ project.setModelVersion( parser.nextText() );
+ }
else if ( parser.getName().equals( "modelVersion" ) )
{
project.setModelVersion( parser.nextText() );
}
+ else if ( parser.getName().equals( "id" ) )
+ {
+ // TODO: localization, logging?
+ System.err.println( "DEPRECATED: please use <artifactId>
instead of <id>" );
+ project.setArtifactId( parser.nextText() );
+ }
else if ( parser.getName().equals( "groupId" ) )
{
project.setGroupId( parser.nextText() );
@@ -71,6 +84,8 @@
}
else if ( parser.getName().equals( "currentVersion" ) )
{
+ // TODO: localization, logging?
+ System.err.println( "DEPRECATED: please use <version> instead
of <currentVersion>" );
project.setVersion( parser.nextText() );
}
else if ( parser.getName().equals( "inceptionYear" ) )
@@ -419,6 +434,7 @@
}
else if ( parser.getName().equals( "jar" ) )
{
+// TODO: localization? logging?
String msg = "You should be using <artifact>
tag " +
"instead of <jar> for Dependency: " +
d.getId();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
