maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Hervé BOUTEMY <herve.bout...@free.fr>
Subject Re: git commit: fix site deploy for svnpubsub using site:stage with ${project.artifactId}-archives/${project.artifactId}-${project.version} will expand values in addition of parent so sucks for multi modules projects.
Date Tue, 01 Jan 2013 23:27:21 GMT
Le samedi 22 décembre 2012 23:37:05 Olivier Lamy a écrit :
> 2012/12/22 Robert Scholte <rfscholte@apache.org>:
> > Hi,
> > 
> > I'm not really pleased with these scripts. The maven-release had cloned
> > these files, and now they're out of sync. We must think of a better way to
> > solve this.
> 
> I have just synced.
> 
> > Can we move this to profiles?
> 
> The configuration need to be different for single module and multi
> modules projects.
I we implement the same idea than MINSTALL-93, we should be able to bind scm-
publish to site-deploy phase, then have the same commands for mono-module and 
multi-modules publications

> So not easy to have generic configuration.
configuration stays specifis, with a pattern to copy/paste: sorry, i don't see 
how to avoid it. That's why I work on simplifying the pattern and making it 
easy to understand

> 
> @Hervé using site:stage doesn't work for me
> see output
> 
> [INFO] Pushing
> /Users/olamy/dev/sources/maven/maven-release/maven-release-manager/target/s
> ite [INFO]    >>> to
> file:///Users/olamy/dev/sources/maven/maven-release/target/staging/../../mav
> en-release-manager-archives/maven-release-manager-2.5-SNAPSHOT/maven-release
> -manager
> 
> this is not correct
> <maven.site.path>${project.artifactId}-archives/${project.artifactId}-${proj
> ect.version}</maven.site.path> then
> <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/co
> ntent/${maven.site.path}</url>
> 
> site won't go in the correct place for multi modules
ok, ${project.artifactId} variable is evaluated *after* inheritence: we can't 
actually evaluate variables before inheritence
so this is simply a question of copying the value instead of using 
${project.artifactId} variable: I dreamt a little too much on the pattern 
simpification

> 
> > Robert
> > 
> > Op Sat, 22 Dec 2012 00:29:15 +0100 schreef <olamy@apache.org>:
> >> Updated Branches:
> >>   refs/heads/master fe5c0331b -> 67ecba8ab
> >> 
> >> fix site deploy for svnpubsub
> >> using site:stage with
> >> ${project.artifactId}-archives/${project.artifactId}-${project.version}
> >> will expand values in addition of parent so sucks for multi modules
> >> projects.
> >> 
> >> 
> >> Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
> >> Commit:
> >> http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/67ecba8a
> >> Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/67ecba8a
> >> Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/67ecba8a
> >> 
> >> Branch: refs/heads/master
> >> Commit: 67ecba8ab9add07e623ae20f4b7078933d2914d3
> >> Parents: fe5c033
> >> Author: olivier lamy <olamy@apache.org>
> >> Authored: Sat Dec 22 00:28:08 2012 +0100
> >> Committer: olivier lamy <olamy@apache.org>
> >> Committed: Sat Dec 22 00:28:08 2012 +0100
> >> 
> >> ----------------------------------------------------------------------
> >> 
> >>  deploySite.sh |    2 +-
> >>  pom.xml       |   19 +++++++++++++++----
> >>  2 files changed, 16 insertions(+), 5 deletions(-)
> >> 
> >> ----------------------------------------------------------------------
> >> 
> >> 
> >> 
> >> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67ecba8a/deplo
> >> ySite.sh
> >> ----------------------------------------------------------------------
> >> diff --git a/deploySite.sh b/deploySite.sh
> >> index be6bc26..b6517a2 100644
> >> --- a/deploySite.sh
> >> +++ b/deploySite.sh
> >> @@ -19,4 +19,4 @@
> >> 
> >>  # under the License.
> >>  #
> >> 
> >> -mvn clean site site:stage scm-publish:publish-scm $@
> >> +mvn clean site-deploy scm-publish:publish-scm $@
> >> 
> >> 
> >> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67ecba8a/pom.x
> >> ml
> >> ----------------------------------------------------------------------
> >> diff --git a/pom.xml b/pom.xml
> >> index c2ac28d..2cfff35 100644
> >> --- a/pom.xml
> >> +++ b/pom.xml
> >> @@ -114,14 +114,19 @@
> >> 
> >>      <mavenVersion>2.0.9</mavenVersion>
> >>      <shadedVersion>2.12.4</shadedVersion>
> >>      <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
> >> 
> >> +
> >> +
> >> 
> >>      <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
> >> 
> >> -
> >> <maven.site.path>${project.artifactId}-archives/${project.artifactId}-${p
> >> roject.version}</maven.site.path> +
> >> <maven.surefire.siteFilePath>${maven.site.cache}/surefire-${project.versi
> >> on}</maven.surefire.siteFilePath> +
> >> <maven.surefire.siteUrlDeployment>file://${maven.surefire.siteFilePath}</
> >> maven.surefire.siteUrlDeployment> +
> >> <maven.surefire.scmPubCheckoutDirectory>${maven.site.cache}/maven-surefir
> >> e-site-content-${project.version}</maven.surefire.scmPubCheckoutDirectory
> >> > +
> >> <maven.surefire.scmPubUrl>https://svn.apache.org/repos/infra/websites/pro
> >> duction/maven/content/surefire-archives/maven-surefire-${project.version}
> >> </maven.surefire.scmPubUrl>>> 
> >>    </properties>
> >>   
> >>   <distributionManagement>
> >>   
> >>      <site>
> >>      
> >>        <id>apache.website</id>
> >> 
> >> -
> >> <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven
> >> /content/${maven.site.path}</url> +     
> >> <url>${maven.surefire.siteUrlDeployment}</url>
> >> 
> >>      </site>
> >>    
> >>    </distributionManagement>
> >> 
> >> @@ -302,7 +307,10 @@
> >> 
> >>            <artifactId>maven-scm-publish-plugin</artifactId>
> >>            <version>1.0-beta-2</version>
> >>            <configuration>
> >> 
> >> -
> >> <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirect
> >> ory> +
> >> <checkoutDirectory>${maven.surefire.scmPubCheckoutDirectory}</checkoutDir
> >> ectory> +           
> >> <pubScmUrl>scm:svn:${maven.surefire.scmPubUrl}</pubScmUrl> +   
       
> >> <checkinComment>Apache Maven Surefire site
> >> deployment</checkinComment>
> >> +            <content>${maven.surefire.siteFilePath}</content>
> >> 
> >>              <tryUpdate>true</tryUpdate>
> >>            
> >>            </configuration>
> >>          
> >>          </plugin>
> >> 
> >> @@ -425,7 +433,10 @@
> >> 
> >>      <profile>
> >>      
> >>        <id>site-release</id>
> >>        <properties>
> >> 
> >> -        <maven.site.path>${project.artifactId}</maven.site.path>
> >> +
> >> <maven.surefire.siteFilePath>${maven.site.cache}/surefire</maven.surefire
> >> .siteFilePath> +
> >> <maven.surefire.siteUrlDeployment>file://${maven.surefire.siteFilePath}</
> >> maven.surefire.siteUrlDeployment> +
> >> <maven.surefire.scmPubCheckoutDirectory>${maven.site.cache}/maven-surefir
> >> e-site-content</maven.surefire.scmPubCheckoutDirectory> +
> >> <maven.surefire.scmPubUrl>https://svn.apache.org/repos/infra/websites/pro
> >> duction/maven/content/surefire</maven.surefire.scmPubUrl>>> 
> >>        </properties>
> >>      
> >>      </profile>
> >>    
> >>    </profiles>
> > 
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> 
> --
> Olivier Lamy
> Talend: http://coders.talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org

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


Mime
View raw message