You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by ol...@apache.org on 2014/03/04 07:10:14 UTC
svn commit: r1573880 - in /onami/trunk/converters: deploySite.sh pom.xml
Author: olamy
Date: Tue Mar 4 06:10:13 2014
New Revision: 1573880
URL: http://svn.apache.org/r1573880
Log:
fix that too
Modified:
onami/trunk/converters/deploySite.sh
onami/trunk/converters/pom.xml
Modified: onami/trunk/converters/deploySite.sh
URL: http://svn.apache.org/viewvc/onami/trunk/converters/deploySite.sh?rev=1573880&r1=1573879&r2=1573880&view=diff
==============================================================================
--- onami/trunk/converters/deploySite.sh (original)
+++ onami/trunk/converters/deploySite.sh Tue Mar 4 06:10:13 2014
@@ -19,4 +19,5 @@
# under the License.
#
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage
+mvn scm-publish:publish-scm $@
Modified: onami/trunk/converters/pom.xml
URL: http://svn.apache.org/viewvc/onami/trunk/converters/pom.xml?rev=1573880&r1=1573879&r2=1573880&view=diff
==============================================================================
--- onami/trunk/converters/pom.xml (original)
+++ onami/trunk/converters/pom.xml Tue Mar 4 06:10:13 2014
@@ -24,6 +24,7 @@
<groupId>org.apache.onami</groupId>
<artifactId>org.apache.onami.parent</artifactId>
<version>4</version>
+ <relativePath></relativePath>
</parent>
<groupId>org.apache.onami.converters</groupId>
@@ -113,6 +114,13 @@
</dependencies>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -122,7 +130,7 @@
<checkoutDirectory>${onami.converters.scmPubCheckoutDirectory}</checkoutDirectory>
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/onami/site/converters</pubScmUrl>
<checkinComment>Onami Converters site deployment</checkinComment>
- <content>${onami.converters.siteFilePath}</content>
+ <content>${project.build.directory}/staging</content>
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
Re: svn commit: r1573880 - in /onami/trunk/converters: deploySite.sh pom.xml
Posted by Simone Tripodi <si...@apache.org>.
+1
http://people.apache.org/~simonetripodi/
http://twitter.com/simonetripodi
On Tue, Mar 4, 2014 at 8:32 AM, Mikhail Mazursky <mikhail.mazursky@gmail.com
> wrote:
> Hm, looks like it is not in plugin management right now. I think we should
> add it.
>
>
> 2014-03-04 13:30 GMT+06:00 Mikhail Mazursky <mi...@gmail.com>:
>
> > Instead of manually specifying maven-site-plugin's version to be 3.3 (to
> > work with latest maven), we should probably release onami parent 5 in
> which
> > we have that version specified in plugin management. What do you think?
> >
> >
> > 2014-03-04 12:10 GMT+06:00 <ol...@apache.org>:
> >
> > Author: olamy
> >> Date: Tue Mar 4 06:10:13 2014
> >> New Revision: 1573880
> >>
> >> URL: http://svn.apache.org/r1573880
> >> Log:
> >> fix that too
> >>
> >> Modified:
> >> onami/trunk/converters/deploySite.sh
> >> onami/trunk/converters/pom.xml
> >>
> >> Modified: onami/trunk/converters/deploySite.sh
> >> URL:
> >>
> http://svn.apache.org/viewvc/onami/trunk/converters/deploySite.sh?rev=1573880&r1=1573879&r2=1573880&view=diff
> >>
> >>
> ==============================================================================
> >> --- onami/trunk/converters/deploySite.sh (original)
> >> +++ onami/trunk/converters/deploySite.sh Tue Mar 4 06:10:13 2014
> >> @@ -19,4 +19,5 @@
> >> # under the License.
> >> #
> >>
> >> -mvn clean site-deploy scm-publish:publish-scm $@
> >> +mvn clean site site:stage
> >> +mvn scm-publish:publish-scm $@
> >>
> >> Modified: onami/trunk/converters/pom.xml
> >> URL:
> >>
> http://svn.apache.org/viewvc/onami/trunk/converters/pom.xml?rev=1573880&r1=1573879&r2=1573880&view=diff
> >>
> >>
> ==============================================================================
> >> --- onami/trunk/converters/pom.xml (original)
> >> +++ onami/trunk/converters/pom.xml Tue Mar 4 06:10:13 2014
> >> @@ -24,6 +24,7 @@
> >> <groupId>org.apache.onami</groupId>
> >> <artifactId>org.apache.onami.parent</artifactId>
> >> <version>4</version>
> >> + <relativePath></relativePath>
> >> </parent>
> >>
> >> <groupId>org.apache.onami.converters</groupId>
> >> @@ -113,6 +114,13 @@
> >> </dependencies>
> >>
> >> <build>
> >> + <plugins>
> >> + <plugin>
> >> + <groupId>org.apache.maven.plugins</groupId>
> >> + <artifactId>maven-site-plugin</artifactId>
> >> + <version>3.3</version>
> >> + </plugin>
> >> + </plugins>
> >> <pluginManagement>
> >> <plugins>
> >> <plugin>
> >> @@ -122,7 +130,7 @@
> >>
> >>
> <checkoutDirectory>${onami.converters.scmPubCheckoutDirectory}</checkoutDirectory>
> >> <pubScmUrl>scm:svn:
> >> https://svn.apache.org/repos/asf/onami/site/converters</pubScmUrl>
> >> <checkinComment>Onami Converters site
> >> deployment</checkinComment>
> >> - <content>${onami.converters.siteFilePath}</content>
> >> + <content>${project.build.directory}/staging</content>
> >> <tryUpdate>true</tryUpdate>
> >> </configuration>
> >> </plugin>
> >>
> >>
> >>
> >
>
Re: svn commit: r1573880 - in /onami/trunk/converters: deploySite.sh pom.xml
Posted by Olivier Lamy <ol...@apache.org>.
sounds a good idea :-)
On 4 March 2014 18:32, Mikhail Mazursky <mi...@gmail.com> wrote:
> Hm, looks like it is not in plugin management right now. I think we should
> add it.
>
>
> 2014-03-04 13:30 GMT+06:00 Mikhail Mazursky <mi...@gmail.com>:
>
>> Instead of manually specifying maven-site-plugin's version to be 3.3 (to
>> work with latest maven), we should probably release onami parent 5 in which
>> we have that version specified in plugin management. What do you think?
>>
>>
>> 2014-03-04 12:10 GMT+06:00 <ol...@apache.org>:
>>
>> Author: olamy
>>> Date: Tue Mar 4 06:10:13 2014
>>> New Revision: 1573880
>>>
>>> URL: http://svn.apache.org/r1573880
>>> Log:
>>> fix that too
>>>
>>> Modified:
>>> onami/trunk/converters/deploySite.sh
>>> onami/trunk/converters/pom.xml
>>>
>>> Modified: onami/trunk/converters/deploySite.sh
>>> URL:
>>> http://svn.apache.org/viewvc/onami/trunk/converters/deploySite.sh?rev=1573880&r1=1573879&r2=1573880&view=diff
>>>
>>> ==============================================================================
>>> --- onami/trunk/converters/deploySite.sh (original)
>>> +++ onami/trunk/converters/deploySite.sh Tue Mar 4 06:10:13 2014
>>> @@ -19,4 +19,5 @@
>>> # under the License.
>>> #
>>>
>>> -mvn clean site-deploy scm-publish:publish-scm $@
>>> +mvn clean site site:stage
>>> +mvn scm-publish:publish-scm $@
>>>
>>> Modified: onami/trunk/converters/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/onami/trunk/converters/pom.xml?rev=1573880&r1=1573879&r2=1573880&view=diff
>>>
>>> ==============================================================================
>>> --- onami/trunk/converters/pom.xml (original)
>>> +++ onami/trunk/converters/pom.xml Tue Mar 4 06:10:13 2014
>>> @@ -24,6 +24,7 @@
>>> <groupId>org.apache.onami</groupId>
>>> <artifactId>org.apache.onami.parent</artifactId>
>>> <version>4</version>
>>> + <relativePath></relativePath>
>>> </parent>
>>>
>>> <groupId>org.apache.onami.converters</groupId>
>>> @@ -113,6 +114,13 @@
>>> </dependencies>
>>>
>>> <build>
>>> + <plugins>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> + <artifactId>maven-site-plugin</artifactId>
>>> + <version>3.3</version>
>>> + </plugin>
>>> + </plugins>
>>> <pluginManagement>
>>> <plugins>
>>> <plugin>
>>> @@ -122,7 +130,7 @@
>>>
>>> <checkoutDirectory>${onami.converters.scmPubCheckoutDirectory}</checkoutDirectory>
>>> <pubScmUrl>scm:svn:
>>> https://svn.apache.org/repos/asf/onami/site/converters</pubScmUrl>
>>> <checkinComment>Onami Converters site
>>> deployment</checkinComment>
>>> - <content>${onami.converters.siteFilePath}</content>
>>> + <content>${project.build.directory}/staging</content>
>>> <tryUpdate>true</tryUpdate>
>>> </configuration>
>>> </plugin>
>>>
>>>
>>>
>>
--
Olivier Lamy
Ecetera: http://ecetera.com.au
http://twitter.com/olamy | http://linkedin.com/in/olamy
Re: svn commit: r1573880 - in /onami/trunk/converters: deploySite.sh pom.xml
Posted by Olivier Lamy <ol...@apache.org>.
sounds a good idea :-)
On 4 March 2014 18:32, Mikhail Mazursky <mi...@gmail.com> wrote:
> Hm, looks like it is not in plugin management right now. I think we should
> add it.
>
>
> 2014-03-04 13:30 GMT+06:00 Mikhail Mazursky <mi...@gmail.com>:
>
>> Instead of manually specifying maven-site-plugin's version to be 3.3 (to
>> work with latest maven), we should probably release onami parent 5 in which
>> we have that version specified in plugin management. What do you think?
>>
>>
>> 2014-03-04 12:10 GMT+06:00 <ol...@apache.org>:
>>
>> Author: olamy
>>> Date: Tue Mar 4 06:10:13 2014
>>> New Revision: 1573880
>>>
>>> URL: http://svn.apache.org/r1573880
>>> Log:
>>> fix that too
>>>
>>> Modified:
>>> onami/trunk/converters/deploySite.sh
>>> onami/trunk/converters/pom.xml
>>>
>>> Modified: onami/trunk/converters/deploySite.sh
>>> URL:
>>> http://svn.apache.org/viewvc/onami/trunk/converters/deploySite.sh?rev=1573880&r1=1573879&r2=1573880&view=diff
>>>
>>> ==============================================================================
>>> --- onami/trunk/converters/deploySite.sh (original)
>>> +++ onami/trunk/converters/deploySite.sh Tue Mar 4 06:10:13 2014
>>> @@ -19,4 +19,5 @@
>>> # under the License.
>>> #
>>>
>>> -mvn clean site-deploy scm-publish:publish-scm $@
>>> +mvn clean site site:stage
>>> +mvn scm-publish:publish-scm $@
>>>
>>> Modified: onami/trunk/converters/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/onami/trunk/converters/pom.xml?rev=1573880&r1=1573879&r2=1573880&view=diff
>>>
>>> ==============================================================================
>>> --- onami/trunk/converters/pom.xml (original)
>>> +++ onami/trunk/converters/pom.xml Tue Mar 4 06:10:13 2014
>>> @@ -24,6 +24,7 @@
>>> <groupId>org.apache.onami</groupId>
>>> <artifactId>org.apache.onami.parent</artifactId>
>>> <version>4</version>
>>> + <relativePath></relativePath>
>>> </parent>
>>>
>>> <groupId>org.apache.onami.converters</groupId>
>>> @@ -113,6 +114,13 @@
>>> </dependencies>
>>>
>>> <build>
>>> + <plugins>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> + <artifactId>maven-site-plugin</artifactId>
>>> + <version>3.3</version>
>>> + </plugin>
>>> + </plugins>
>>> <pluginManagement>
>>> <plugins>
>>> <plugin>
>>> @@ -122,7 +130,7 @@
>>>
>>> <checkoutDirectory>${onami.converters.scmPubCheckoutDirectory}</checkoutDirectory>
>>> <pubScmUrl>scm:svn:
>>> https://svn.apache.org/repos/asf/onami/site/converters</pubScmUrl>
>>> <checkinComment>Onami Converters site
>>> deployment</checkinComment>
>>> - <content>${onami.converters.siteFilePath}</content>
>>> + <content>${project.build.directory}/staging</content>
>>> <tryUpdate>true</tryUpdate>
>>> </configuration>
>>> </plugin>
>>>
>>>
>>>
>>
--
Olivier Lamy
Ecetera: http://ecetera.com.au
http://twitter.com/olamy | http://linkedin.com/in/olamy
Re: svn commit: r1573880 - in /onami/trunk/converters: deploySite.sh pom.xml
Posted by Mikhail Mazursky <mi...@gmail.com>.
Hm, looks like it is not in plugin management right now. I think we should
add it.
2014-03-04 13:30 GMT+06:00 Mikhail Mazursky <mi...@gmail.com>:
> Instead of manually specifying maven-site-plugin's version to be 3.3 (to
> work with latest maven), we should probably release onami parent 5 in which
> we have that version specified in plugin management. What do you think?
>
>
> 2014-03-04 12:10 GMT+06:00 <ol...@apache.org>:
>
> Author: olamy
>> Date: Tue Mar 4 06:10:13 2014
>> New Revision: 1573880
>>
>> URL: http://svn.apache.org/r1573880
>> Log:
>> fix that too
>>
>> Modified:
>> onami/trunk/converters/deploySite.sh
>> onami/trunk/converters/pom.xml
>>
>> Modified: onami/trunk/converters/deploySite.sh
>> URL:
>> http://svn.apache.org/viewvc/onami/trunk/converters/deploySite.sh?rev=1573880&r1=1573879&r2=1573880&view=diff
>>
>> ==============================================================================
>> --- onami/trunk/converters/deploySite.sh (original)
>> +++ onami/trunk/converters/deploySite.sh Tue Mar 4 06:10:13 2014
>> @@ -19,4 +19,5 @@
>> # under the License.
>> #
>>
>> -mvn clean site-deploy scm-publish:publish-scm $@
>> +mvn clean site site:stage
>> +mvn scm-publish:publish-scm $@
>>
>> Modified: onami/trunk/converters/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/onami/trunk/converters/pom.xml?rev=1573880&r1=1573879&r2=1573880&view=diff
>>
>> ==============================================================================
>> --- onami/trunk/converters/pom.xml (original)
>> +++ onami/trunk/converters/pom.xml Tue Mar 4 06:10:13 2014
>> @@ -24,6 +24,7 @@
>> <groupId>org.apache.onami</groupId>
>> <artifactId>org.apache.onami.parent</artifactId>
>> <version>4</version>
>> + <relativePath></relativePath>
>> </parent>
>>
>> <groupId>org.apache.onami.converters</groupId>
>> @@ -113,6 +114,13 @@
>> </dependencies>
>>
>> <build>
>> + <plugins>
>> + <plugin>
>> + <groupId>org.apache.maven.plugins</groupId>
>> + <artifactId>maven-site-plugin</artifactId>
>> + <version>3.3</version>
>> + </plugin>
>> + </plugins>
>> <pluginManagement>
>> <plugins>
>> <plugin>
>> @@ -122,7 +130,7 @@
>>
>> <checkoutDirectory>${onami.converters.scmPubCheckoutDirectory}</checkoutDirectory>
>> <pubScmUrl>scm:svn:
>> https://svn.apache.org/repos/asf/onami/site/converters</pubScmUrl>
>> <checkinComment>Onami Converters site
>> deployment</checkinComment>
>> - <content>${onami.converters.siteFilePath}</content>
>> + <content>${project.build.directory}/staging</content>
>> <tryUpdate>true</tryUpdate>
>> </configuration>
>> </plugin>
>>
>>
>>
>
Re: svn commit: r1573880 - in /onami/trunk/converters: deploySite.sh pom.xml
Posted by Mikhail Mazursky <mi...@gmail.com>.
Instead of manually specifying maven-site-plugin's version to be 3.3 (to
work with latest maven), we should probably release onami parent 5 in which
we have that version specified in plugin management. What do you think?
2014-03-04 12:10 GMT+06:00 <ol...@apache.org>:
> Author: olamy
> Date: Tue Mar 4 06:10:13 2014
> New Revision: 1573880
>
> URL: http://svn.apache.org/r1573880
> Log:
> fix that too
>
> Modified:
> onami/trunk/converters/deploySite.sh
> onami/trunk/converters/pom.xml
>
> Modified: onami/trunk/converters/deploySite.sh
> URL:
> http://svn.apache.org/viewvc/onami/trunk/converters/deploySite.sh?rev=1573880&r1=1573879&r2=1573880&view=diff
>
> ==============================================================================
> --- onami/trunk/converters/deploySite.sh (original)
> +++ onami/trunk/converters/deploySite.sh Tue Mar 4 06:10:13 2014
> @@ -19,4 +19,5 @@
> # under the License.
> #
>
> -mvn clean site-deploy scm-publish:publish-scm $@
> +mvn clean site site:stage
> +mvn scm-publish:publish-scm $@
>
> Modified: onami/trunk/converters/pom.xml
> URL:
> http://svn.apache.org/viewvc/onami/trunk/converters/pom.xml?rev=1573880&r1=1573879&r2=1573880&view=diff
>
> ==============================================================================
> --- onami/trunk/converters/pom.xml (original)
> +++ onami/trunk/converters/pom.xml Tue Mar 4 06:10:13 2014
> @@ -24,6 +24,7 @@
> <groupId>org.apache.onami</groupId>
> <artifactId>org.apache.onami.parent</artifactId>
> <version>4</version>
> + <relativePath></relativePath>
> </parent>
>
> <groupId>org.apache.onami.converters</groupId>
> @@ -113,6 +114,13 @@
> </dependencies>
>
> <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-site-plugin</artifactId>
> + <version>3.3</version>
> + </plugin>
> + </plugins>
> <pluginManagement>
> <plugins>
> <plugin>
> @@ -122,7 +130,7 @@
>
> <checkoutDirectory>${onami.converters.scmPubCheckoutDirectory}</checkoutDirectory>
> <pubScmUrl>scm:svn:
> https://svn.apache.org/repos/asf/onami/site/converters</pubScmUrl>
> <checkinComment>Onami Converters site
> deployment</checkinComment>
> - <content>${onami.converters.siteFilePath}</content>
> + <content>${project.build.directory}/staging</content>
> <tryUpdate>true</tryUpdate>
> </configuration>
> </plugin>
>
>
>