maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dennis Lundberg <dennisl.apa...@gmail.com>
Subject Re: svn commit: r1505380 - in /maven/resources/trunk: apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm pom.xml resources-bundles-sample/pom.xml
Date Sun, 21 Jul 2013 22:15:05 GMT
On Sun, Jul 21, 2013 at 9:19 PM, sebb <sebbaz@gmail.com> wrote:
> On 21 July 2013 14:39,  <dennisl@apache.org> wrote:
>> Author: dennisl
>> Date: Sun Jul 21 13:39:23 2013
>> New Revision: 1505380
>>
>> URL: http://svn.apache.org/r1505380
>> Log:
>> Remove spurious blank lines in generated NOTICE file.
>>
>> Modified:
>>     maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
>>     maven/resources/trunk/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
>>     maven/resources/trunk/pom.xml
>>     maven/resources/trunk/resources-bundles-sample/pom.xml
>>
>> Modified: maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
>> URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm?rev=1505380&r1=1505379&r2=1505380&view=diff
>> ==============================================================================
>> --- maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
(original)
>> +++ maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
Sun Jul 21 13:39:23 2013
>> @@ -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 @@ Copyright ${projectTimespan}#if($project
>>
>>  This product includes software developed at
>>  The Apache Software Foundation (http://www.apache.org/).
>> -
>> -
>>
>> Modified: maven/resources/trunk/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
>> URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm?rev=1505380&r1=1505379&r2=1505380&view=diff
>> ==============================================================================
>> --- maven/resources/trunk/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
(original)
>> +++ maven/resources/trunk/apache-jar-txt-resource-bundle/src/main/resources/META-INF/NOTICE.txt.vm
Sun Jul 21 13:39:23 2013
>> @@ -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 @@ Copyright ${projectTimespan}#if($project
>>
>>  This product includes software developed at
>>  The Apache Software Foundation (http://www.apache.org/).
>> -
>> -
>>
>> Modified: maven/resources/trunk/pom.xml
>> URL: http://svn.apache.org/viewvc/maven/resources/trunk/pom.xml?rev=1505380&r1=1505379&r2=1505380&view=diff
>> ==============================================================================
>> --- maven/resources/trunk/pom.xml (original)
>> +++ maven/resources/trunk/pom.xml Sun Jul 21 13:39:23 2013
>> @@ -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>
>>
>> Modified: maven/resources/trunk/resources-bundles-sample/pom.xml
>> URL: http://svn.apache.org/viewvc/maven/resources/trunk/resources-bundles-sample/pom.xml?rev=1505380&r1=1505379&r2=1505380&view=diff
>> ==============================================================================
>> --- maven/resources/trunk/resources-bundles-sample/pom.xml (original)
>> +++ maven/resources/trunk/resources-bundles-sample/pom.xml Sun Jul 21 13:39:23 2013
>> @@ -41,7 +41,7 @@
>>
>>    <dependencies>
>>      <dependency>
>> -      <groupId>org.apache</groupId>
>> +      <groupId>org.apache.apache.resources</groupId>
>
> apache.apache ?
>
> Should that be: org.apache.maven.resources ?

No, it is to signify that these are ASF shared resources not Maven resources.
Similarly the ASF parent POM has a groupId of org.apache, not org.apache.maven.

>>        <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>
>
> Ditto ?
>
>>                  <!-- 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  -->
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>



-- 
Dennis Lundberg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Mime
View raw message