You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by ol...@apache.org on 2013/11/08 00:20:51 UTC
git commit: more fix
Updated Branches:
refs/heads/master ab80f616c -> 88630b64e
more fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/88630b64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/88630b64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/88630b64
Branch: refs/heads/master
Commit: 88630b64e08dca3fa1a8fd33b497e2d4380c151c
Parents: ab80f61
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Nov 8 10:20:42 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Nov 8 10:20:42 2013 +1100
----------------------------------------------------------------------
pom.xml | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/88630b64/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee63d54..647cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,15 @@
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-batchee.git;a=summary</url>
</scm>
+ <properties>
+ <atinject.version>1.0</atinject.version>
+ <batch-api.version>1.0</batch-api.version>
+ <jackson.version>2.2.2</jackson.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <batchee.scmPubUrl>https://svn.apache.org/repos/asf/incubator/batchee/site-content/</batchee.scmPubUrl>
+ <batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
+ </properties>
+
<ciManagement>
<system>jenkins</system>
<url>https://builds.apache.org/job/batchee/</url>
@@ -48,6 +57,13 @@
<url>https://issues.apache.org/jira/browse/BATCHEE</url>
</issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:${batchee.scmPubUrl}</url>
+ </site>
+ </distributionManagement>
+
<mailingLists>
<mailingList>
<name>Users</name>
@@ -273,15 +289,6 @@
</plugins>
</build>
- <properties>
- <atinject.version>1.0</atinject.version>
- <batch-api.version>1.0</batch-api.version>
- <jackson.version>2.2.2</jackson.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <batchee.scmPubUrl>https://svn.apache.org/repos/asf/incubator/batchee/site-content/</batchee.scmPubUrl>
- <batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
- </properties>
-
<repositories>
<repository>
<id>apache-snapshot-repository</id>
Re: git commit: more fix
Posted by Romain Manni-Bucau <rm...@gmail.com>.
works, thks
Romain Manni-Bucau
Twitter: @rmannibucau
Blog: http://rmannibucau.wordpress.com/
LinkedIn: http://fr.linkedin.com/in/rmannibucau
Github: https://github.com/rmannibucau
2013/11/8 Olivier Lamy <ol...@apache.org>:
> No not in target.
> The idea is to have a local copy of the svn content so when you want
> to deploy the site you just update your local workspace.
> If moving this to target, use mvn clean ... and you will have to
> checkout again the site (this svnpubsub is already a pain so don't
> make it worst :-) )
> The idea is to make site deployment less slower.
> BTW I agree the path could be better (you can override it in your
> settings). So I will change that to .site-content and git/svn ignore.
>
>
> On 8 November 2013 16:45, Romain Manni-Bucau <rm...@gmail.com> wrote:
>> Hi Olivier
>>
>> You did the same for sirona but I didnt take time to ask: why putting site
>> in home? Basically the default is in target and it is what I expect. I know
>> this way you dont use update but when building I dont expect anything out
>> of target or in the worse case tmp
>> ---------- Message transféré ----------
>> De : <ol...@apache.org>
>> Date : 8 nov. 2013 00:21
>> Objet : git commit: more fix
>> À : <co...@batchee.incubator.apache.org>
>>
>> Updated Branches:
>> refs/heads/master ab80f616c -> 88630b64e
>>
>>
>> more fix
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/88630b64
>> Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/88630b64
>> Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/88630b64
>>
>> Branch: refs/heads/master
>> Commit: 88630b64e08dca3fa1a8fd33b497e2d4380c151c
>> Parents: ab80f61
>> Author: Olivier Lamy <ol...@apache.org>
>> Authored: Fri Nov 8 10:20:42 2013 +1100
>> Committer: Olivier Lamy <ol...@apache.org>
>> Committed: Fri Nov 8 10:20:42 2013 +1100
>>
>> ----------------------------------------------------------------------
>> pom.xml | 25 ++++++++++++++++---------
>> 1 file changed, 16 insertions(+), 9 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/88630b64/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/pom.xml b/pom.xml
>> index ee63d54..647cb04 100644
>> --- a/pom.xml
>> +++ b/pom.xml
>> @@ -38,6 +38,15 @@
>> <url>
>> https://git-wip-us.apache.org/repos/asf?p=incubator-batchee.git;a=summary
>> </url>
>> </scm>
>>
>> + <properties>
>> + <atinject.version>1.0</atinject.version>
>> + <batch-api.version>1.0</batch-api.version>
>> + <jackson.version>2.2.2</jackson.version>
>> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
>> + <batchee.scmPubUrl>
>> https://svn.apache.org/repos/asf/incubator/batchee/site-content/
>> </batchee.scmPubUrl>
>> +
>> <batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
>> + </properties>
>> +
>> <ciManagement>
>> <system>jenkins</system>
>> <url>https://builds.apache.org/job/batchee/</url>
>> @@ -48,6 +57,13 @@
>> <url>https://issues.apache.org/jira/browse/BATCHEE</url>
>> </issueManagement>
>>
>> + <distributionManagement>
>> + <site>
>> + <id>apache.website</id>
>> + <url>scm:svn:${batchee.scmPubUrl}</url>
>> + </site>
>> + </distributionManagement>
>> +
>> <mailingLists>
>> <mailingList>
>> <name>Users</name>
>> @@ -273,15 +289,6 @@
>> </plugins>
>> </build>
>>
>> - <properties>
>> - <atinject.version>1.0</atinject.version>
>> - <batch-api.version>1.0</batch-api.version>
>> - <jackson.version>2.2.2</jackson.version>
>> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
>> - <batchee.scmPubUrl>
>> https://svn.apache.org/repos/asf/incubator/batchee/site-content/
>> </batchee.scmPubUrl>
>> -
>> <batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
>> - </properties>
>> -
>> <repositories>
>> <repository>
>> <id>apache-snapshot-repository</id>
>
>
>
> --
> Olivier Lamy
> Ecetera: http://ecetera.com.au
> http://twitter.com/olamy | http://linkedin.com/in/olamy
Re: git commit: more fix
Posted by Olivier Lamy <ol...@apache.org>.
No not in target.
The idea is to have a local copy of the svn content so when you want
to deploy the site you just update your local workspace.
If moving this to target, use mvn clean ... and you will have to
checkout again the site (this svnpubsub is already a pain so don't
make it worst :-) )
The idea is to make site deployment less slower.
BTW I agree the path could be better (you can override it in your
settings). So I will change that to .site-content and git/svn ignore.
On 8 November 2013 16:45, Romain Manni-Bucau <rm...@gmail.com> wrote:
> Hi Olivier
>
> You did the same for sirona but I didnt take time to ask: why putting site
> in home? Basically the default is in target and it is what I expect. I know
> this way you dont use update but when building I dont expect anything out
> of target or in the worse case tmp
> ---------- Message transféré ----------
> De : <ol...@apache.org>
> Date : 8 nov. 2013 00:21
> Objet : git commit: more fix
> À : <co...@batchee.incubator.apache.org>
>
> Updated Branches:
> refs/heads/master ab80f616c -> 88630b64e
>
>
> more fix
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/88630b64
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/88630b64
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/88630b64
>
> Branch: refs/heads/master
> Commit: 88630b64e08dca3fa1a8fd33b497e2d4380c151c
> Parents: ab80f61
> Author: Olivier Lamy <ol...@apache.org>
> Authored: Fri Nov 8 10:20:42 2013 +1100
> Committer: Olivier Lamy <ol...@apache.org>
> Committed: Fri Nov 8 10:20:42 2013 +1100
>
> ----------------------------------------------------------------------
> pom.xml | 25 ++++++++++++++++---------
> 1 file changed, 16 insertions(+), 9 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/88630b64/pom.xml
> ----------------------------------------------------------------------
> diff --git a/pom.xml b/pom.xml
> index ee63d54..647cb04 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -38,6 +38,15 @@
> <url>
> https://git-wip-us.apache.org/repos/asf?p=incubator-batchee.git;a=summary
> </url>
> </scm>
>
> + <properties>
> + <atinject.version>1.0</atinject.version>
> + <batch-api.version>1.0</batch-api.version>
> + <jackson.version>2.2.2</jackson.version>
> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> + <batchee.scmPubUrl>
> https://svn.apache.org/repos/asf/incubator/batchee/site-content/
> </batchee.scmPubUrl>
> +
> <batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
> + </properties>
> +
> <ciManagement>
> <system>jenkins</system>
> <url>https://builds.apache.org/job/batchee/</url>
> @@ -48,6 +57,13 @@
> <url>https://issues.apache.org/jira/browse/BATCHEE</url>
> </issueManagement>
>
> + <distributionManagement>
> + <site>
> + <id>apache.website</id>
> + <url>scm:svn:${batchee.scmPubUrl}</url>
> + </site>
> + </distributionManagement>
> +
> <mailingLists>
> <mailingList>
> <name>Users</name>
> @@ -273,15 +289,6 @@
> </plugins>
> </build>
>
> - <properties>
> - <atinject.version>1.0</atinject.version>
> - <batch-api.version>1.0</batch-api.version>
> - <jackson.version>2.2.2</jackson.version>
> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> - <batchee.scmPubUrl>
> https://svn.apache.org/repos/asf/incubator/batchee/site-content/
> </batchee.scmPubUrl>
> -
> <batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
> - </properties>
> -
> <repositories>
> <repository>
> <id>apache-snapshot-repository</id>
--
Olivier Lamy
Ecetera: http://ecetera.com.au
http://twitter.com/olamy | http://linkedin.com/in/olamy
Fwd: git commit: more fix
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Hi Olivier
You did the same for sirona but I didnt take time to ask: why putting site
in home? Basically the default is in target and it is what I expect. I know
this way you dont use update but when building I dont expect anything out
of target or in the worse case tmp
---------- Message transféré ----------
De : <ol...@apache.org>
Date : 8 nov. 2013 00:21
Objet : git commit: more fix
À : <co...@batchee.incubator.apache.org>
Updated Branches:
refs/heads/master ab80f616c -> 88630b64e
more fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/88630b64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/88630b64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/88630b64
Branch: refs/heads/master
Commit: 88630b64e08dca3fa1a8fd33b497e2d4380c151c
Parents: ab80f61
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Nov 8 10:20:42 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Nov 8 10:20:42 2013 +1100
----------------------------------------------------------------------
pom.xml | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/88630b64/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee63d54..647cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,15 @@
<url>
https://git-wip-us.apache.org/repos/asf?p=incubator-batchee.git;a=summary
</url>
</scm>
+ <properties>
+ <atinject.version>1.0</atinject.version>
+ <batch-api.version>1.0</batch-api.version>
+ <jackson.version>2.2.2</jackson.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <batchee.scmPubUrl>
https://svn.apache.org/repos/asf/incubator/batchee/site-content/
</batchee.scmPubUrl>
+
<batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
+ </properties>
+
<ciManagement>
<system>jenkins</system>
<url>https://builds.apache.org/job/batchee/</url>
@@ -48,6 +57,13 @@
<url>https://issues.apache.org/jira/browse/BATCHEE</url>
</issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:${batchee.scmPubUrl}</url>
+ </site>
+ </distributionManagement>
+
<mailingLists>
<mailingList>
<name>Users</name>
@@ -273,15 +289,6 @@
</plugins>
</build>
- <properties>
- <atinject.version>1.0</atinject.version>
- <batch-api.version>1.0</batch-api.version>
- <jackson.version>2.2.2</jackson.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <batchee.scmPubUrl>
https://svn.apache.org/repos/asf/incubator/batchee/site-content/
</batchee.scmPubUrl>
-
<batchee.scmPubCheckoutDirectory>${user.home}/batchee-site</batchee.scmPubCheckoutDirectory>
- </properties>
-
<repositories>
<repository>
<id>apache-snapshot-repository</id>