jvanzyl 02/03/18 11:10:45
Modified: src/java/org/apache/maven ProjectProperties.java
Log:
Be defensive. Thanks to david.
Revision Changes Path
1.12 +40 -9
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProjectProperties.java 17 Mar 2002 00:12:15 -0000 1.11
+++ ProjectProperties.java 18 Mar 2002 19:10:44 -0000 1.12
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.11 2002/03/17 00:12:15 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.12 2002/03/18 19:10:44 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -116,14 +116,45 @@
// Add some basic attribute values of the project in
// the ant build process.
- getProject().setProperty("name", mavenProject.getName());
- getProject().setProperty("currentVersion",
mavenProject.getCurrentVersion());
- getProject().setProperty("id", mavenProject.getId());
- getProject().setProperty("organization", mavenProject.getOrganization());
- getProject().setProperty("inceptionYear", mavenProject.getInceptionYear());
- getProject().setProperty("package", mavenProject.getPackage());
- getProject().setProperty("siteAddress", mavenProject.getSiteAddress());
- getProject().setProperty("siteDirectory", mavenProject.getSiteDirectory());
+ if (mavenProject.getName() != null)
+ {
+ getProject().setProperty("name", mavenProject.getName());
+ }
+
+ if (mavenProject.getCurrentVersion() != null)
+ {
+ getProject().setProperty("currentVersion",
mavenProject.getCurrentVersion());
+ }
+
+ if (mavenProject.getId() != null)
+ {
+ getProject().setProperty("id", mavenProject.getId());
+ }
+
+ if (mavenProject.getOrganization() != null)
+ {
+ getProject().setProperty("organization",
mavenProject.getOrganization());
+ }
+
+ if (mavenProject.getInceptionYear() != null)
+ {
+ getProject().setProperty("inceptionYear",
mavenProject.getInceptionYear());
+ }
+
+ if (mavenProject.getPackage() != null)
+ {
+ getProject().setProperty("package", mavenProject.getPackage());
+ }
+
+ if (mavenProject.getSiteAddress() != null)
+ {
+ getProject().setProperty("siteAddress", mavenProject.getSiteAddress());
+ }
+
+ if (mavenProject.getSiteDirectory() != null)
+ {
+ getProject().setProperty("siteDirectory",
mavenProject.getSiteDirectory());
+ }
}
// Create the classpath reference
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
