archiva-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brett Porter <br...@apache.org>
Subject Re: svn commit: r1583496 - in /archiva/branches/archiva-1.3.x/archiva-jetty: pom.xml src/main/assembly/bin.xml
Date Mon, 21 Apr 2014 06:41:38 GMT
Something weird here - this fix didn't apply in the 1.3.8 release, though I just rebuilt from
source and it was ok. Maybe there is different plugin ordering on different versions of Maven?
I don't recall there being any difference when I built it...

Since the source release we voted on doesn't need a change, I intend to just upload new binaries
under a "1.3.8.1" version, and update the site. I've confirmed the only difference in the
ZIPs is the wrapper.conf.

Please feel free to verify the binaries: https://dist.apache.org/repos/dist/dev/archiva/1.3.8/binaries/


On 9 Apr 2014, at 11:00 am, Brett Porter <brett@apache.org> wrote:

> Thanks!
> 
> On 9 Apr 2014, at 3:41 am, Eric Barboni <Eric.Barboni@irit.fr> wrote:
> 
>> Hi
>> 
>> I hope http://svn.apache.org/r1585541 is what you had in mind.
>> 
>> Eric
>> 
>> 
>> -----Message d'origine-----
>> De : Brett Porter [mailto:brett@porterclan.net] De la part de Brett Porter
>> Envoyé : lundi 7 avril 2014 14:34
>> À : dev@archiva.apache.org
>> Objet : Re: svn commit: r1583496 - in
>> /archiva/branches/archiva-1.3.x/archiva-jetty: pom.xml
>> src/main/assembly/bin.xml
>> 
>> Thanks.
>> 
>> However, this now suffers the problem with ARCHIVA_BASE that I patched for
>> 2.0.0 previously. I'll update tomorrow, but if you have a chance to look and
>> adjust beforehand, I'd appreciate it :)
>> 
>> On 1 Apr 2014, at 11:02 am, skygo@apache.org wrote:
>> 
>>> Author: skygo
>>> Date: Tue Apr  1 00:02:32 2014
>>> New Revision: 1583496
>>> 
>>> URL: http://svn.apache.org/r1583496
>>> Log:
>>> appassembler-maven-plugin up to 1.7, better x64 selection for deamon
>>> 
>>> Modified:
>>>  archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml
>>> 
>>> archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml
>>> 
>>> Modified: archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml
>>> URL: 
>>> http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-je
>>> tty/pom.xml?rev=1583496&r1=1583495&r2=1583496&view=diff
>>> ======================================================================
>>> ========
>>> --- archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml (original)
>>> +++ archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml Tue Apr  1 
>>> +++ 00:02:32 2014
>>> @@ -98,8 +98,9 @@
>>>      <plugin>
>>>       <groupId>org.codehaus.mojo</groupId>
>>>       <artifactId>appassembler-maven-plugin</artifactId>
>>> -        <version>1.0</version>
>>> +        <version>1.7</version>
>>>       <configuration>
>>> +          <configurationDirectory>conf</configurationDirectory>
>>>         <daemons>
>>>           <daemon>
>>>             <id>archiva</id>
>>> @@ -163,6 +164,7 @@
>>>                   <include>solaris-sparc-32</include>
>>>                   <include>solaris-sparc-64</include>
>>>                   <include>windows-x86-32</include>
>>> +                    <include>windows-x86-64</include>
>>>                 </includes>
>>>               </generatorConfiguration>
>>>             </generatorConfigurations>
>>> 
>>> Modified: 
>>> archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml
>>> URL: 
>>> http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-je
>>> tty/src/main/assembly/bin.xml?rev=1583496&r1=1583495&r2=1583496&view=d
>>> iff 
>>> ======================================================================
>>> ========
>>> --- 
>>> archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml 
>>> (original)
>>> +++ archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin
>>> +++ .xml Tue Apr  1 00:02:32 2014
>>> @@ -82,6 +82,7 @@
>>>     <outputDirectory>bin</outputDirectory>
>>>     <includes>   
>>>       <include>wrapper-windows-x86-32.exe</include>
>>> +        <include>wrapper-windows-x86-64.exe</include>
>>>     </includes>
>>>     <fileMode>0755</fileMode>
>>>   </fileSet>
>>> 
>>> 
>> 
>> --
>> Brett Porter   @brettporter
>> http://brettporter.wordpress.com/
>> http://au.linkedin.com/in/brettporter
>> 
>> 
> 
> --
> Brett Porter   @brettporter
> http://brettporter.wordpress.com/
> http://au.linkedin.com/in/brettporter
> 

--
Brett Porter   @brettporter
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter


Mime
View raw message