Merge changes from sandbox. (MRRESOURCES-12 included)
git-svn-id: https://svn.apache.org/repos/asf/maven/resources/trunk@512287 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/apache-incubator-disclaimer-resource-bundle/pom.xml b/apache-incubator-disclaimer-resource-bundle/pom.xml
index adbbd34..1ffbfb6 100644
--- a/apache-incubator-disclaimer-resource-bundle/pom.xml
+++ b/apache-incubator-disclaimer-resource-bundle/pom.xml
@@ -4,10 +4,10 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache-resource-bundles</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>1</version>
</parent>
<artifactId>apache-incubator-disclaimer-resource-bundle</artifactId>
- <name>Apache License Header Resource Bundle</name>
+ <name>Apache Incubator Disclaimer Resource Bundle</name>
<version>1.1-SNAPSHOT</version>
<inceptionYear>2006</inceptionYear>
<description>
diff --git a/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.txt b/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.vm
similarity index 79%
rename from apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.txt
rename to apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.vm
index 2347150..1099472 100644
--- a/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.txt
+++ b/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.vm
@@ -1,4 +1,4 @@
-${project.name} is an effort undergoing incubation at the Apache Software
+#if(${projectName})${projectName}#else${project.name}#end is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Apache Incubator PMC.
Incubation is required of all newly accepted projects until a further review
diff --git a/apache-jar-resource-bundle/pom.xml b/apache-jar-resource-bundle/pom.xml
index 340dc31..71859a6 100644
--- a/apache-jar-resource-bundle/pom.xml
+++ b/apache-jar-resource-bundle/pom.xml
@@ -8,7 +8,7 @@
</parent>
<artifactId>apache-jar-resource-bundle</artifactId>
<name>Apache JAR Resource Bundle</name>
- <version>1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<inceptionYear>2006</inceptionYear>
<description>
An archive which contains templates for generating the necessary license files and notices for all Apache releases.
diff --git a/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm b/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
index bfd4113..ed2f259 100644
--- a/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
+++ b/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
@@ -1,13 +1,17 @@
// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
-// Version 2.0, in this case for ${project.name}
+// Version 2.0, in this case for #if ($projectName)$projectName#else${project.name}#end
+
// ------------------------------------------------------------------
-${project.name}
-Copyright ${projectTimespan} The Apache Software Foundation
+#if ($projectName)$projectName#else${project.name}#end
+
+Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
+
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+#if($project.organization.name)$project.organization.name ($project.organization.url).#else
+The Apache Software Foundation (http://www.apache.org/).#end
#if($preProjectText)
$preProjectText
