Remove spurious blank lines in generated NOTICE file.
git-svn-id: https://svn.apache.org/repos/asf/maven/resources/trunk@1505380 13f79535-47bb-0310-9956-ffa450edef68
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 259ca65..7304708 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
@@ -18,7 +18,6 @@
##
## $Id$
##
-
#if ($projectName)$projectName#else${project.name}#end
Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
@@ -26,5 +25,3 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-
diff --git a/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm b/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
index cd5a206..34531a3 100644
--- a/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
+++ b/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
@@ -18,7 +18,6 @@
##
## $Id: NOTICE.vm 638319 2008-03-18 11:10:09Z vsiveton $
##
-
#if ($projectName)$projectName#else${project.name}#end
Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
@@ -26,5 +25,3 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-
diff --git a/pom.xml b/pom.xml
index c4da4e4..ccae87f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<inceptionYear>2012</inceptionYear>
<properties>
- <apache-jar-resource-bundle-version>1.4</apache-jar-resource-bundle-version>
+ <apache-jar-resource-bundle-version>1.5-SNAPSHOT</apache-jar-resource-bundle-version>
<apache-jar-txt-resource-bundle-version>1.5-SNAPSHOT</apache-jar-txt-resource-bundle-version>
<apache-incubator-disclaimer-resource-bundle-version>1.2-SNAPSHOT</apache-incubator-disclaimer-resource-bundle-version>
<apache-source-release-assembly-descriptor-version>1.0.3</apache-source-release-assembly-descriptor-version>
diff --git a/resources-bundles-sample/pom.xml b/resources-bundles-sample/pom.xml
index 3035882..8b4a12e 100644
--- a/resources-bundles-sample/pom.xml
+++ b/resources-bundles-sample/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-jar-resource-bundle</artifactId>
<version>${apache-jar-resource-bundle-version}</version>
</dependency>
@@ -73,7 +73,7 @@
<configuration>
<resourceBundles>
<!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE -->
- <resourceBundle>org.apache:apache-jar-resource-bundle:${apache-jar-resource-bundle-version}</resourceBundle>
+ <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:${apache-jar-resource-bundle-version}</resourceBundle>
<!-- Will generate META-INF/DEPENDENCIES.txt META-INF/LICENSE.txt META-INF/NOTICE.txt -->
<resourceBundle>org.apache.apache.resources:apache-jar-txt-resource-bundle:${apache-jar-txt-resource-bundle-version}</resourceBundle>
<!-- Will generate META-INF/DISCLAIMER -->
