You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/03/22 16:09:32 UTC
svn commit: r1580221 - in /maven/site/trunk:
content/apt/guides/mini/guide-using-ant.apt
content/apt/plugin-developers/plugin-testing.apt pom.xml
Author: khmarbaise
Date: Sat Mar 22 15:09:32 2014
New Revision: 1580221
URL: http://svn.apache.org/r1580221
Log:
[MNGSITE-197]
- Fixed documentation and our own pom according
to prevent using of ${basedir}. Better use
${project.basedir} instead.
Modified:
maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
maven/site/trunk/pom.xml
Modified: maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt (original)
+++ maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt Sat Mar 22 15:09:32 2014
@@ -69,8 +69,8 @@ Guide to using Ant with Maven
<configuration>
<tasks>
<exec
- dir="${basedir}"
- executable="${basedir}/src/main/sh/do-something.sh"
+ dir="${project.basedir}"
+ executable="${project.basedir}/src/main/sh/do-something.sh"
failonerror="true">
<arg line="arg1 arg2 arg3 arg4" />
</exec>
@@ -86,4 +86,4 @@ Guide to using Ant with Maven
</build>
</project>
-+----+
\ No newline at end of file
++----+
Modified: maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
==============================================================================
--- maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt (original)
+++ maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt Sat Mar 22 15:09:32 2014
@@ -261,7 +261,7 @@ public class TrivialMavenVerifierTest ex
<artifactId>maven-it-plugin</artifactId>
<version>1.0-alpha-1-SNAPSHOT</version>
<configuration>
- <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory>
+ <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsDirectory>
<includes>
<include>**/pom.xml</include>
</includes>
@@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
<goal>install-file</goal>
</goals>
<configuration>
- <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
+ <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-XXX-plugin</artifactId>
<version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT -->
<packaging>maven-plugin</packaging>
- <pomFile>${basedir}/pom.xml</pomFile>
+ <pomFile>${project.basedir}/pom.xml</pomFile>
</configuration>
</execution>
</executions>
@@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
...
<reporting>
<outputDirectory>
- ${basedir}/../../../../../target/it/it1/target/site
+ ${project.basedir}/../../../../../target/it/it1/target/site
</outputDirectory>
<plugins>
<plugin>
Modified: maven/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=1580220&r2=1580221&view=diff
==============================================================================
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
@@ -96,7 +96,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
- <siteDirectory>${basedir}/content</siteDirectory>
+ <siteDirectory>${project.basedir}/content</siteDirectory>
</configuration>
<dependencies>
<dependency>
@@ -148,7 +148,7 @@
<outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/content/filtered-resources</directory>
+ <directory>${project.basedir}/content/filtered-resources</directory>
<filtering>true</filtering>
</resource>
</resources>
@@ -223,8 +223,8 @@
</goals>
<configuration>
<outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
- <siteDirectory>${basedir}/content</siteDirectory>
- <docDescriptor>${basedir}/content/pdf.xml</docDescriptor>
+ <siteDirectory>${project.basedir}/content</siteDirectory>
+ <docDescriptor>${project.basedir}/content/pdf.xml</docDescriptor>
</configuration>
</execution>
</executions>
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt
content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Karl Heinz Marbaise <kh...@gmx.de>.
Hi Hervé,
>>
>> Outch...missed that...will that bite the site generation in any way ? I
>> hope not otherwise it's simple to undone the change...
> if I read your site modifications correctly, you didn't change any case where
> ${basedir} was used in file-based profile activation: so don't worry, you didn't
> cause any harm
Pooh....thanks...for reviewing it...
Kind regards
Karl-Heinz Marbaise
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Hervé BOUTEMY <he...@free.fr>.
Le samedi 22 mars 2014 17:30:27 Karl Heinz Marbaise a écrit :
> Hi Hervé,
>
> > notice we should do something on profile activation, because ${basedir} is
> > supported here but not ${project.basedir}
> > see MNG-5590
>
> Outch...missed that...will that bite the site generation in any way ? I
> hope not otherwise it's simple to undone the change...
if I read your site modifications correctly, you didn't change any case where
${basedir} was used in file-based profile activation: so don't worry, you didn't
cause any harm
>
> > IMHO, we should add support for ${project.basedir} in file-based profile
> > activation, and properly document this precise case in deprecation
> > documentation
> >
> >
> > WDYT?
>
> Of course we should add support for ${project.basedir} and document that
> in particular in relationship with MNG-5590 ...there is really a need to
> do something about that, cause everywhere it is mentioned/documented
> ${basedir} is bad (and deprecated)...
yes, some users reported that problem: we need to fix our communication on
${basedir}
>
> Kind regards
> Karl-Heinz Marbaise
>
> ---------------------------------------------------------------------
> 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
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt
content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Karl Heinz Marbaise <kh...@gmx.de>.
Hi Hervé,
>
> notice we should do something on profile activation, because ${basedir} is
> supported here but not ${project.basedir}
> see MNG-5590
Outch...missed that...will that bite the site generation in any way ? I
hope not otherwise it's simple to undone the change...
>
> IMHO, we should add support for ${project.basedir} in file-based profile
> activation, and properly document this precise case in deprecation
> documentation
>
> WDYT?
Of course we should add support for ${project.basedir} and document that
in particular in relationship with MNG-5590 ...there is really a need to
do something about that, cause everywhere it is mentioned/documented
${basedir} is bad (and deprecated)...
Kind regards
Karl-Heinz Marbaise
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Hervé BOUTEMY <he...@free.fr>.
then fixed :)
Le dimanche 23 mars 2014 18:25:56 Hervé BOUTEMY a écrit :
> MNG-5608 created
>
> Le dimanche 23 mars 2014 18:01:57 Robert Scholte a écrit :
> > I agree with the warning, because failing will break backwards
> > compatibility. Maybe failing is an option for M4.
> >
> > Robert
> >
> > Op Sun, 23 Mar 2014 17:35:35 +0100 schreef Hervé BOUTEMY
> >
> > <he...@free.fr>:
> > > I improved documentation on this limited interpolation support for
> > > file-based
> > > profile activation
> > >
> > > IMHO, we should at least warn if someone uses ${project.basedir} at this
> > > place, and perhaps even fail since it causes really strange behaviour
> > > for
> > > people not knowing this (even if it is every day better documented)
> > >
> > >
> > > Regards,
> > >
> > > Hervé
> > >
> > > Le samedi 22 mars 2014 19:31:59 Robert Scholte a écrit :
> > >> Op Sat, 22 Mar 2014 17:12:49 +0100 schreef Hervé BOUTEMY
> > >>
> > >> <he...@free.fr>:
> > >> > well done
> > >> >
> > >> > notice we should do something on profile activation, because
> > >>
> > >> ${basedir}
> > >>
> > >> > is
> > >> > supported here but not ${project.basedir}
> > >> > see MNG-5590
> > >> >
> > >> > IMHO, we should add support for ${project.basedir} in file-based
> > >>
> > >> profile
> > >>
> > >> > activation, and properly document this precise case in deprecation
> > >> > documentation
> > >>
> > >> I'm not so sure about this. I think we should make it very clear that
> > >> you
> > >> can't use the MavenProject ( i.e. any project.* valure ) for profile
> > >> activation. IMHO by allowing ${project.basedir} you create unnecessary
> > >> exceptions.
> > >>
> > >> The MavenProject has more references to paths, should we allow these
> > >> too?
> > >>
> > >> One thing I haven't figured out yet is the behavior of an artifact
> > >> which
> > >> has a file based profile activation. I hope such profile is not used,
> > >> in
> > >> other words that file based profile activation can only be a buildtime
> > >> profile and not a consumer profile.
> > >>
> > >> Robert
> > >>
> > >> > WDYT?
> > >> >
> > >> > Regards,
> > >> >
> > >> > Hervé
> > >> >
> > >> > Le samedi 22 mars 2014 15:09:32 khmarbaise@apache.org a écrit :
> > >> >> Author: khmarbaise
> > >> >> Date: Sat Mar 22 15:09:32 2014
> > >> >> New Revision: 1580221
> > >> >>
> > >> >> URL: http://svn.apache.org/r1580221
> > >> >> Log:
> > >> >> [MNGSITE-197]
> > >> >>
> > >> >> - Fixed documentation and our own pom according
> > >> >>
> > >> >> to prevent using of ${basedir}. Better use
> > >> >> ${project.basedir} instead.
> > >> >>
> > >> >> Modified:
> > >> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> > >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.ap
> > >> >> t
> > >> >> maven/site/trunk/pom.xml
> > >> >>
> > >> >> Modified:
> > >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> > >>
> > >> >> URL:
> > >> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/g
> > >> ui
> > >>
> > >> >> de
> > >> >> -using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> > >>
> > >> =======================================================================
> > >> ==
> > >>
> > >> >> ==
> > >> >> === --- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> > >> >> (original) +++
> > >> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> > >> >> Sat Mar 22 15:09:32 2014 @@ -69,8 +69,8 @@ Guide to using Ant with
> > >>
> > >> Maven
> > >>
> > >> >> <configuration>
> > >> >>
> > >> >> <tasks>
> > >> >>
> > >> >> <exec
> > >> >>
> > >> >> - dir="${basedir}"
> > >> >> -
> > >>
> > >> executable="${basedir}/src/main/sh/do-something.sh"
> > >>
> > >> >> + dir="${project.basedir}"
> > >> >> +
> > >> >> executable="${project.basedir}/src/main/sh/do-something.sh"
> > >> >> failonerror="true">
> > >> >>
> > >> >> <arg line="arg1 arg2 arg3 arg4" />
> > >> >>
> > >> >> </exec>
> > >> >>
> > >> >> @@ -86,4 +86,4 @@ Guide to using Ant with Maven
> > >> >>
> > >> >> </build>
> > >> >>
> > >> >> </project>
> > >> >>
> > >> >> -+----+
> > >> >> \ No newline at end of file
> > >> >> ++----+
> > >> >>
> > >> >> Modified:
> > >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> > >>
> > >> >> URL:
> > >> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-develo
> > >> pe
> > >>
> > >> >> rs
> > >> >> /plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> > >>
> > >> =======================================================================
> > >> ==
> > >>
> > >> >> ==
> > >> >> === ---
> > >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> > >> >> (original) +++
> > >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> > >> >> Sat
> > >> >> Mar
> > >> >> 22 15:09:32 2014 @@ -261,7 +261,7 @@ public class
> > >> >> TrivialMavenVerifierTest
> > >> >> ex
> > >> >>
> > >> >> <artifactId>maven-it-plugin</artifactId>
> > >> >> <version>1.0-alpha-1-SNAPSHOT</version>
> > >> >> <configuration>
> > >> >>
> > >> >> -
> > >>
> > >> <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory
> > >> >
> > >>
> > >> >> +
> > >>
> > >> <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsD
> > >> ir
> > >>
> > >> >> ec
> > >> >> tory> <includes>
> > >> >>
> > >> >> <include>**/pom.xml</include>
> > >> >>
> > >> >> </includes>
> > >> >>
> > >> >> @@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
> > >> >>
> > >> >> <goal>install-file</goal>
> > >> >>
> > >> >> </goals>
> > >> >> <configuration>
> > >> >>
> > >> >> -
> > >> >> <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file> +
> > >>
> > >> <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</fil
> > >> e>
> > >>
> > >> >> <groupId>org.apache.maven.plugins</groupId>
> > >> >>
> > >> >> <artifactId>maven-XXX-plugin</artifactId>
> > >> >> <version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT
> > >>
> > >> -->
> > >>
> > >> >> <packaging>maven-plugin</packaging>
> > >> >>
> > >> >> - <pomFile>${basedir}/pom.xml</pomFile>
> > >> >> + <pomFile>${project.basedir}/pom.xml</pomFile>
> > >> >>
> > >> >> </configuration>
> > >> >>
> > >> >> </execution>
> > >> >>
> > >> >> </executions>
> > >> >>
> > >> >> @@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
> > >> >>
> > >> >> ...
> > >> >>
> > >> >> <reporting>
> > >> >>
> > >> >> <outputDirectory>
> > >> >>
> > >> >> - ${basedir}/../../../../../target/it/it1/target/site
> > >> >> + ${project.basedir}/../../../../../target/it/it1/target/site
> > >> >>
> > >> >> </outputDirectory>
> > >> >> <plugins>
> > >> >>
> > >> >> <plugin>
> > >> >>
> > >> >> Modified: maven/site/trunk/pom.xml
> > >>
> > >> >> URL:
> > >> http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=15
> > >> 80
> > >>
> > >> >> 22
> > >> >> 0&r2=1580221&view=diff
> > >>
> > >> =======================================================================
> > >> ==
> > >>
> > >> >> ==
> > >> >> === --- maven/site/trunk/pom.xml (original)
> > >> >> +++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
> > >> >> @@ -96,7 +96,7 @@
> > >> >>
> > >> >> <artifactId>maven-site-plugin</artifactId>
> > >> >> <version>3.3</version>
> > >> >> <configuration>
> > >> >>
> > >> >> - <siteDirectory>${basedir}/content</siteDirectory>
> > >> >> +
> > >>
> > >> <siteDirectory>${project.basedir}/content</siteDirectory>
> > >>
> > >> >> </configuration>
> > >> >> <dependencies>
> > >> >>
> > >> >> <dependency>
> > >> >>
> > >> >> @@ -148,7 +148,7 @@
> > >>
> > >> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> > >>
> > >> >> <resources>
> > >> >>
> > >> >> <resource>
> > >> >>
> > >> >> -
> > >> >> <directory>${basedir}/content/filtered-resources</directory> +
> > >>
> > >> <directory>${project.basedir}/content/filtered-resources</directory>
> > >>
> > >> >> <filtering>true</filtering>
> > >> >>
> > >> >> </resource>
> > >> >>
> > >> >> </resources>
> > >> >>
> > >> >> @@ -223,8 +223,8 @@
> > >> >>
> > >> >> </goals>
> > >> >> <configuration>
> > >>
> > >> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> > >>
> > >> >> -
> > >> >>
> > >> >> <siteDirectory>${basedir}/content</siteDirectory> -
> > >> >>
> > >> >> <docDescriptor>${basedir}/content/pdf.xml</docDescriptor> +
> > >> >>
> > >> >> <siteDirectory>${project.basedir}/content</siteDirectory> +
> > >>
> > >> <docDescriptor>${project.basedir}/content/pdf.xml</docDescripto
> > >>
> > >> >> r>
> > >> >>
> > >> >> </configuration>
> > >> >>
> > >> >> </execution>
> > >> >>
> > >> >> </executions>
> > >> >
> > >> > ---------------------------------------------------------------------
> > >> > 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
> > >
> > > ---------------------------------------------------------------------
> > > 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
>
> ---------------------------------------------------------------------
> 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
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Hervé BOUTEMY <he...@free.fr>.
MNG-5608 created
Le dimanche 23 mars 2014 18:01:57 Robert Scholte a écrit :
> I agree with the warning, because failing will break backwards
> compatibility. Maybe failing is an option for M4.
>
> Robert
>
> Op Sun, 23 Mar 2014 17:35:35 +0100 schreef Hervé BOUTEMY
>
> <he...@free.fr>:
> > I improved documentation on this limited interpolation support for
> > file-based
> > profile activation
> >
> > IMHO, we should at least warn if someone uses ${project.basedir} at this
> > place, and perhaps even fail since it causes really strange behaviour for
> > people not knowing this (even if it is every day better documented)
> >
> >
> > Regards,
> >
> > Hervé
> >
> > Le samedi 22 mars 2014 19:31:59 Robert Scholte a écrit :
> >> Op Sat, 22 Mar 2014 17:12:49 +0100 schreef Hervé BOUTEMY
> >>
> >> <he...@free.fr>:
> >> > well done
> >> >
> >> > notice we should do something on profile activation, because
> >>
> >> ${basedir}
> >>
> >> > is
> >> > supported here but not ${project.basedir}
> >> > see MNG-5590
> >> >
> >> > IMHO, we should add support for ${project.basedir} in file-based
> >>
> >> profile
> >>
> >> > activation, and properly document this precise case in deprecation
> >> > documentation
> >>
> >> I'm not so sure about this. I think we should make it very clear that
> >> you
> >> can't use the MavenProject ( i.e. any project.* valure ) for profile
> >> activation. IMHO by allowing ${project.basedir} you create unnecessary
> >> exceptions.
> >>
> >> The MavenProject has more references to paths, should we allow these
> >> too?
> >>
> >> One thing I haven't figured out yet is the behavior of an artifact which
> >> has a file based profile activation. I hope such profile is not used, in
> >> other words that file based profile activation can only be a buildtime
> >> profile and not a consumer profile.
> >>
> >> Robert
> >>
> >> > WDYT?
> >> >
> >> > Regards,
> >> >
> >> > Hervé
> >> >
> >> > Le samedi 22 mars 2014 15:09:32 khmarbaise@apache.org a écrit :
> >> >> Author: khmarbaise
> >> >> Date: Sat Mar 22 15:09:32 2014
> >> >> New Revision: 1580221
> >> >>
> >> >> URL: http://svn.apache.org/r1580221
> >> >> Log:
> >> >> [MNGSITE-197]
> >> >>
> >> >> - Fixed documentation and our own pom according
> >> >>
> >> >> to prevent using of ${basedir}. Better use
> >> >> ${project.basedir} instead.
> >> >>
> >> >> Modified:
> >> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> >> >> maven/site/trunk/pom.xml
> >> >>
> >> >> Modified:
> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >>
> >> >> URL:
> >> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/gui
> >>
> >> >> de
> >> >> -using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> >>
> >> =========================================================================
> >>
> >> >> ==
> >> >> === --- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> >> (original) +++
> >> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> >> Sat Mar 22 15:09:32 2014 @@ -69,8 +69,8 @@ Guide to using Ant with
> >>
> >> Maven
> >>
> >> >> <configuration>
> >> >>
> >> >> <tasks>
> >> >>
> >> >> <exec
> >> >>
> >> >> - dir="${basedir}"
> >> >> -
> >>
> >> executable="${basedir}/src/main/sh/do-something.sh"
> >>
> >> >> + dir="${project.basedir}"
> >> >> +
> >> >> executable="${project.basedir}/src/main/sh/do-something.sh"
> >> >> failonerror="true">
> >> >>
> >> >> <arg line="arg1 arg2 arg3 arg4" />
> >> >>
> >> >> </exec>
> >> >>
> >> >> @@ -86,4 +86,4 @@ Guide to using Ant with Maven
> >> >>
> >> >> </build>
> >> >>
> >> >> </project>
> >> >>
> >> >> -+----+
> >> >> \ No newline at end of file
> >> >> ++----+
> >> >>
> >> >> Modified:
> >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> >>
> >> >> URL:
> >> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-develope
> >>
> >> >> rs
> >> >> /plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> >>
> >> =========================================================================
> >>
> >> >> ==
> >> >> === ---
> >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> >> >> (original) +++
> >> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt Sat
> >> >> Mar
> >> >> 22 15:09:32 2014 @@ -261,7 +261,7 @@ public class
> >> >> TrivialMavenVerifierTest
> >> >> ex
> >> >>
> >> >> <artifactId>maven-it-plugin</artifactId>
> >> >> <version>1.0-alpha-1-SNAPSHOT</version>
> >> >> <configuration>
> >> >>
> >> >> -
> >>
> >> <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory>
> >>
> >> >> +
> >>
> >> <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsDir
> >>
> >> >> ec
> >> >> tory> <includes>
> >> >>
> >> >> <include>**/pom.xml</include>
> >> >>
> >> >> </includes>
> >> >>
> >> >> @@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
> >> >>
> >> >> <goal>install-file</goal>
> >> >>
> >> >> </goals>
> >> >> <configuration>
> >> >>
> >> >> -
> >> >> <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file> +
> >>
> >> <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
> >>
> >> >> <groupId>org.apache.maven.plugins</groupId>
> >> >>
> >> >> <artifactId>maven-XXX-plugin</artifactId>
> >> >> <version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT
> >>
> >> -->
> >>
> >> >> <packaging>maven-plugin</packaging>
> >> >>
> >> >> - <pomFile>${basedir}/pom.xml</pomFile>
> >> >> + <pomFile>${project.basedir}/pom.xml</pomFile>
> >> >>
> >> >> </configuration>
> >> >>
> >> >> </execution>
> >> >>
> >> >> </executions>
> >> >>
> >> >> @@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
> >> >>
> >> >> ...
> >> >>
> >> >> <reporting>
> >> >>
> >> >> <outputDirectory>
> >> >>
> >> >> - ${basedir}/../../../../../target/it/it1/target/site
> >> >> + ${project.basedir}/../../../../../target/it/it1/target/site
> >> >>
> >> >> </outputDirectory>
> >> >> <plugins>
> >> >>
> >> >> <plugin>
> >> >>
> >> >> Modified: maven/site/trunk/pom.xml
> >>
> >> >> URL:
> >> http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=1580
> >>
> >> >> 22
> >> >> 0&r2=1580221&view=diff
> >>
> >> =========================================================================
> >>
> >> >> ==
> >> >> === --- maven/site/trunk/pom.xml (original)
> >> >> +++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
> >> >> @@ -96,7 +96,7 @@
> >> >>
> >> >> <artifactId>maven-site-plugin</artifactId>
> >> >> <version>3.3</version>
> >> >> <configuration>
> >> >>
> >> >> - <siteDirectory>${basedir}/content</siteDirectory>
> >> >> +
> >>
> >> <siteDirectory>${project.basedir}/content</siteDirectory>
> >>
> >> >> </configuration>
> >> >> <dependencies>
> >> >>
> >> >> <dependency>
> >> >>
> >> >> @@ -148,7 +148,7 @@
> >>
> >> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> >>
> >> >> <resources>
> >> >>
> >> >> <resource>
> >> >>
> >> >> -
> >> >> <directory>${basedir}/content/filtered-resources</directory> +
> >>
> >> <directory>${project.basedir}/content/filtered-resources</directory>
> >>
> >> >> <filtering>true</filtering>
> >> >>
> >> >> </resource>
> >> >>
> >> >> </resources>
> >> >>
> >> >> @@ -223,8 +223,8 @@
> >> >>
> >> >> </goals>
> >> >> <configuration>
> >>
> >> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> >>
> >> >> -
> >> >>
> >> >> <siteDirectory>${basedir}/content</siteDirectory> -
> >> >>
> >> >> <docDescriptor>${basedir}/content/pdf.xml</docDescriptor> +
> >> >>
> >> >> <siteDirectory>${project.basedir}/content</siteDirectory> +
> >>
> >> <docDescriptor>${project.basedir}/content/pdf.xml</docDescripto
> >>
> >> >> r>
> >> >>
> >> >> </configuration>
> >> >>
> >> >> </execution>
> >> >>
> >> >> </executions>
> >> >
> >> > ---------------------------------------------------------------------
> >> > 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
> >
> > ---------------------------------------------------------------------
> > 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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1580221 - in /maven/site/trunk:
content/apt/guides/mini/guide-using-ant.apt
content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Robert Scholte <rf...@apache.org>.
I agree with the warning, because failing will break backwards
compatibility. Maybe failing is an option for M4.
Robert
Op Sun, 23 Mar 2014 17:35:35 +0100 schreef Hervé BOUTEMY
<he...@free.fr>:
> I improved documentation on this limited interpolation support for
> file-based
> profile activation
>
> IMHO, we should at least warn if someone uses ${project.basedir} at this
> place, and perhaps even fail since it causes really strange behaviour for
> people not knowing this (even if it is every day better documented)
>
>
> Regards,
>
> Hervé
>
> Le samedi 22 mars 2014 19:31:59 Robert Scholte a écrit :
>> Op Sat, 22 Mar 2014 17:12:49 +0100 schreef Hervé BOUTEMY
>>
>> <he...@free.fr>:
>> > well done
>> >
>> > notice we should do something on profile activation, because
>> ${basedir}
>> > is
>> > supported here but not ${project.basedir}
>> > see MNG-5590
>> >
>> > IMHO, we should add support for ${project.basedir} in file-based
>> profile
>> > activation, and properly document this precise case in deprecation
>> > documentation
>>
>> I'm not so sure about this. I think we should make it very clear that
>> you
>> can't use the MavenProject ( i.e. any project.* valure ) for profile
>> activation. IMHO by allowing ${project.basedir} you create unnecessary
>> exceptions.
>>
>> The MavenProject has more references to paths, should we allow these
>> too?
>>
>> One thing I haven't figured out yet is the behavior of an artifact which
>> has a file based profile activation. I hope such profile is not used, in
>> other words that file based profile activation can only be a buildtime
>> profile and not a consumer profile.
>>
>> Robert
>>
>> > WDYT?
>> >
>> > Regards,
>> >
>> > Hervé
>> >
>> > Le samedi 22 mars 2014 15:09:32 khmarbaise@apache.org a écrit :
>> >> Author: khmarbaise
>> >> Date: Sat Mar 22 15:09:32 2014
>> >> New Revision: 1580221
>> >>
>> >> URL: http://svn.apache.org/r1580221
>> >> Log:
>> >> [MNGSITE-197]
>> >>
>> >> - Fixed documentation and our own pom according
>> >>
>> >> to prevent using of ${basedir}. Better use
>> >> ${project.basedir} instead.
>> >>
>> >> Modified:
>> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
>> >> maven/site/trunk/pom.xml
>> >>
>> >> Modified:
>> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/gui
>> >> de
>> >> -using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
>> >>
>> =========================================================================
>> >> ==
>> >> === --- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> >> (original) +++
>> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> >> Sat Mar 22 15:09:32 2014 @@ -69,8 +69,8 @@ Guide to using Ant with
>> Maven
>> >>
>> >> <configuration>
>> >>
>> >> <tasks>
>> >>
>> >> <exec
>> >>
>> >> - dir="${basedir}"
>> >> -
>> executable="${basedir}/src/main/sh/do-something.sh"
>> >> + dir="${project.basedir}"
>> >> +
>> >> executable="${project.basedir}/src/main/sh/do-something.sh"
>> >> failonerror="true">
>> >>
>> >> <arg line="arg1 arg2 arg3 arg4" />
>> >>
>> >> </exec>
>> >>
>> >> @@ -86,4 +86,4 @@ Guide to using Ant with Maven
>> >>
>> >> </build>
>> >>
>> >> </project>
>> >>
>> >> -+----+
>> >> \ No newline at end of file
>> >> ++----+
>> >>
>> >> Modified:
>> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-develope
>> >> rs
>> >> /plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
>> >>
>> =========================================================================
>> >> ==
>> >> === ---
>> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
>> >> (original) +++
>> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt Sat
>> >> Mar
>> >> 22 15:09:32 2014 @@ -261,7 +261,7 @@ public class
>> >> TrivialMavenVerifierTest
>> >> ex
>> >>
>> >> <artifactId>maven-it-plugin</artifactId>
>> >> <version>1.0-alpha-1-SNAPSHOT</version>
>> >> <configuration>
>> >>
>> >> -
>> >>
>> <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory>
>> >> +
>> >>
>> >>
>> <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsDir
>> >> ec
>> >> tory> <includes>
>> >>
>> >> <include>**/pom.xml</include>
>> >>
>> >> </includes>
>> >>
>> >> @@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
>> >>
>> >> <goal>install-file</goal>
>> >>
>> >> </goals>
>> >> <configuration>
>> >>
>> >> -
>> >> <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file> +
>> >>
>> >>
>> <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
>> >> <groupId>org.apache.maven.plugins</groupId>
>> >>
>> >> <artifactId>maven-XXX-plugin</artifactId>
>> >> <version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT
>> -->
>> >> <packaging>maven-plugin</packaging>
>> >>
>> >> - <pomFile>${basedir}/pom.xml</pomFile>
>> >> + <pomFile>${project.basedir}/pom.xml</pomFile>
>> >>
>> >> </configuration>
>> >>
>> >> </execution>
>> >>
>> >> </executions>
>> >>
>> >> @@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
>> >>
>> >> ...
>> >>
>> >> <reporting>
>> >>
>> >> <outputDirectory>
>> >>
>> >> - ${basedir}/../../../../../target/it/it1/target/site
>> >> + ${project.basedir}/../../../../../target/it/it1/target/site
>> >>
>> >> </outputDirectory>
>> >> <plugins>
>> >>
>> >> <plugin>
>> >>
>> >> Modified: maven/site/trunk/pom.xml
>> >> URL:
>> >>
>> http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=1580
>> >> 22
>> >> 0&r2=1580221&view=diff
>> >>
>> =========================================================================
>> >> ==
>> >> === --- maven/site/trunk/pom.xml (original)
>> >> +++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
>> >> @@ -96,7 +96,7 @@
>> >>
>> >> <artifactId>maven-site-plugin</artifactId>
>> >> <version>3.3</version>
>> >> <configuration>
>> >>
>> >> - <siteDirectory>${basedir}/content</siteDirectory>
>> >> +
>> <siteDirectory>${project.basedir}/content</siteDirectory>
>> >>
>> >> </configuration>
>> >> <dependencies>
>> >>
>> >> <dependency>
>> >>
>> >> @@ -148,7 +148,7 @@
>> >>
>> >>
>> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
>> >> <resources>
>> >>
>> >> <resource>
>> >>
>> >> -
>> >> <directory>${basedir}/content/filtered-resources</directory> +
>> >>
>> >>
>> <directory>${project.basedir}/content/filtered-resources</directory>
>> >>
>> >> <filtering>true</filtering>
>> >>
>> >> </resource>
>> >>
>> >> </resources>
>> >>
>> >> @@ -223,8 +223,8 @@
>> >>
>> >> </goals>
>> >> <configuration>
>> >>
>> >>
>> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
>> >> -
>> >>
>> >> <siteDirectory>${basedir}/content</siteDirectory> -
>> >>
>> >> <docDescriptor>${basedir}/content/pdf.xml</docDescriptor> +
>> >>
>> >> <siteDirectory>${project.basedir}/content</siteDirectory> +
>> >>
>> >>
>> <docDescriptor>${project.basedir}/content/pdf.xml</docDescripto
>> >> r>
>> >>
>> >> </configuration>
>> >>
>> >> </execution>
>> >>
>> >> </executions>
>> >
>> > ---------------------------------------------------------------------
>> > 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
>
>
> ---------------------------------------------------------------------
> 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
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Hervé BOUTEMY <he...@free.fr>.
I improved documentation on this limited interpolation support for file-based
profile activation
IMHO, we should at least warn if someone uses ${project.basedir} at this
place, and perhaps even fail since it causes really strange behaviour for
people not knowing this (even if it is every day better documented)
Regards,
Hervé
Le samedi 22 mars 2014 19:31:59 Robert Scholte a écrit :
> Op Sat, 22 Mar 2014 17:12:49 +0100 schreef Hervé BOUTEMY
>
> <he...@free.fr>:
> > well done
> >
> > notice we should do something on profile activation, because ${basedir}
> > is
> > supported here but not ${project.basedir}
> > see MNG-5590
> >
> > IMHO, we should add support for ${project.basedir} in file-based profile
> > activation, and properly document this precise case in deprecation
> > documentation
>
> I'm not so sure about this. I think we should make it very clear that you
> can't use the MavenProject ( i.e. any project.* valure ) for profile
> activation. IMHO by allowing ${project.basedir} you create unnecessary
> exceptions.
>
> The MavenProject has more references to paths, should we allow these too?
>
> One thing I haven't figured out yet is the behavior of an artifact which
> has a file based profile activation. I hope such profile is not used, in
> other words that file based profile activation can only be a buildtime
> profile and not a consumer profile.
>
> Robert
>
> > WDYT?
> >
> > Regards,
> >
> > Hervé
> >
> > Le samedi 22 mars 2014 15:09:32 khmarbaise@apache.org a écrit :
> >> Author: khmarbaise
> >> Date: Sat Mar 22 15:09:32 2014
> >> New Revision: 1580221
> >>
> >> URL: http://svn.apache.org/r1580221
> >> Log:
> >> [MNGSITE-197]
> >>
> >> - Fixed documentation and our own pom according
> >>
> >> to prevent using of ${basedir}. Better use
> >> ${project.basedir} instead.
> >>
> >> Modified:
> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> >> maven/site/trunk/pom.xml
> >>
> >> Modified: maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> URL:
> >> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/gui
> >> de
> >> -using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> >> =========================================================================
> >> ==
> >> === --- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> (original) +++
> >> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> >> Sat Mar 22 15:09:32 2014 @@ -69,8 +69,8 @@ Guide to using Ant with Maven
> >>
> >> <configuration>
> >>
> >> <tasks>
> >>
> >> <exec
> >>
> >> - dir="${basedir}"
> >> - executable="${basedir}/src/main/sh/do-something.sh"
> >> + dir="${project.basedir}"
> >> +
> >> executable="${project.basedir}/src/main/sh/do-something.sh"
> >> failonerror="true">
> >>
> >> <arg line="arg1 arg2 arg3 arg4" />
> >>
> >> </exec>
> >>
> >> @@ -86,4 +86,4 @@ Guide to using Ant with Maven
> >>
> >> </build>
> >>
> >> </project>
> >>
> >> -+----+
> >> \ No newline at end of file
> >> ++----+
> >>
> >> Modified:
> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> >> URL:
> >> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-develope
> >> rs
> >> /plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> >> =========================================================================
> >> ==
> >> === ---
> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> >> (original) +++
> >> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt Sat
> >> Mar
> >> 22 15:09:32 2014 @@ -261,7 +261,7 @@ public class
> >> TrivialMavenVerifierTest
> >> ex
> >>
> >> <artifactId>maven-it-plugin</artifactId>
> >> <version>1.0-alpha-1-SNAPSHOT</version>
> >> <configuration>
> >>
> >> -
> >> <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory>
> >> +
> >>
> >> <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsDir
> >> ec
> >> tory> <includes>
> >>
> >> <include>**/pom.xml</include>
> >>
> >> </includes>
> >>
> >> @@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
> >>
> >> <goal>install-file</goal>
> >>
> >> </goals>
> >> <configuration>
> >>
> >> -
> >> <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file> +
> >>
> >> <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
> >> <groupId>org.apache.maven.plugins</groupId>
> >>
> >> <artifactId>maven-XXX-plugin</artifactId>
> >> <version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT -->
> >> <packaging>maven-plugin</packaging>
> >>
> >> - <pomFile>${basedir}/pom.xml</pomFile>
> >> + <pomFile>${project.basedir}/pom.xml</pomFile>
> >>
> >> </configuration>
> >>
> >> </execution>
> >>
> >> </executions>
> >>
> >> @@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
> >>
> >> ...
> >>
> >> <reporting>
> >>
> >> <outputDirectory>
> >>
> >> - ${basedir}/../../../../../target/it/it1/target/site
> >> + ${project.basedir}/../../../../../target/it/it1/target/site
> >>
> >> </outputDirectory>
> >> <plugins>
> >>
> >> <plugin>
> >>
> >> Modified: maven/site/trunk/pom.xml
> >> URL:
> >> http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=1580
> >> 22
> >> 0&r2=1580221&view=diff
> >> =========================================================================
> >> ==
> >> === --- maven/site/trunk/pom.xml (original)
> >> +++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
> >> @@ -96,7 +96,7 @@
> >>
> >> <artifactId>maven-site-plugin</artifactId>
> >> <version>3.3</version>
> >> <configuration>
> >>
> >> - <siteDirectory>${basedir}/content</siteDirectory>
> >> + <siteDirectory>${project.basedir}/content</siteDirectory>
> >>
> >> </configuration>
> >> <dependencies>
> >>
> >> <dependency>
> >>
> >> @@ -148,7 +148,7 @@
> >>
> >> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> >> <resources>
> >>
> >> <resource>
> >>
> >> -
> >> <directory>${basedir}/content/filtered-resources</directory> +
> >>
> >> <directory>${project.basedir}/content/filtered-resources</directory>
> >>
> >> <filtering>true</filtering>
> >>
> >> </resource>
> >>
> >> </resources>
> >>
> >> @@ -223,8 +223,8 @@
> >>
> >> </goals>
> >> <configuration>
> >>
> >> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> >> -
> >>
> >> <siteDirectory>${basedir}/content</siteDirectory> -
> >>
> >> <docDescriptor>${basedir}/content/pdf.xml</docDescriptor> +
> >>
> >> <siteDirectory>${project.basedir}/content</siteDirectory> +
> >>
> >> <docDescriptor>${project.basedir}/content/pdf.xml</docDescripto
> >> r>
> >>
> >> </configuration>
> >>
> >> </execution>
> >>
> >> </executions>
> >
> > ---------------------------------------------------------------------
> > 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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1580221 - in /maven/site/trunk:
content/apt/guides/mini/guide-using-ant.apt
content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Robert Scholte <rf...@apache.org>.
Op Sat, 22 Mar 2014 17:12:49 +0100 schreef Hervé BOUTEMY
<he...@free.fr>:
> well done
>
> notice we should do something on profile activation, because ${basedir}
> is
> supported here but not ${project.basedir}
> see MNG-5590
>
> IMHO, we should add support for ${project.basedir} in file-based profile
> activation, and properly document this precise case in deprecation
> documentation
I'm not so sure about this. I think we should make it very clear that you
can't use the MavenProject ( i.e. any project.* valure ) for profile
activation. IMHO by allowing ${project.basedir} you create unnecessary
exceptions.
The MavenProject has more references to paths, should we allow these too?
One thing I haven't figured out yet is the behavior of an artifact which
has a file based profile activation. I hope such profile is not used, in
other words that file based profile activation can only be a buildtime
profile and not a consumer profile.
Robert
>
> WDYT?
>
> Regards,
>
> Hervé
>
> Le samedi 22 mars 2014 15:09:32 khmarbaise@apache.org a écrit :
>> Author: khmarbaise
>> Date: Sat Mar 22 15:09:32 2014
>> New Revision: 1580221
>>
>> URL: http://svn.apache.org/r1580221
>> Log:
>> [MNGSITE-197]
>> - Fixed documentation and our own pom according
>> to prevent using of ${basedir}. Better use
>> ${project.basedir} instead.
>>
>> Modified:
>> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
>> maven/site/trunk/pom.xml
>>
>> Modified: maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> URL:
>> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide
>> -using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
>> ===========================================================================
>> === --- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> (original) +++
>> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
>> Sat Mar 22 15:09:32 2014 @@ -69,8 +69,8 @@ Guide to using Ant with Maven
>> <configuration>
>> <tasks>
>> <exec
>> - dir="${basedir}"
>> - executable="${basedir}/src/main/sh/do-something.sh"
>> + dir="${project.basedir}"
>> +
>> executable="${project.basedir}/src/main/sh/do-something.sh"
>> failonerror="true">
>> <arg line="arg1 arg2 arg3 arg4" />
>> </exec>
>> @@ -86,4 +86,4 @@ Guide to using Ant with Maven
>> </build>
>> </project>
>>
>> -+----+
>> \ No newline at end of file
>> ++----+
>>
>> Modified:
>> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
>> URL:
>> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-developers
>> /plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
>> ===========================================================================
>> === ---
>> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
>> (original) +++
>> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt Sat
>> Mar
>> 22 15:09:32 2014 @@ -261,7 +261,7 @@ public class
>> TrivialMavenVerifierTest
>> ex
>> <artifactId>maven-it-plugin</artifactId>
>> <version>1.0-alpha-1-SNAPSHOT</version>
>> <configuration>
>> -
>> <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory>
>> +
>>
>> <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsDirec
>> tory> <includes>
>> <include>**/pom.xml</include>
>> </includes>
>> @@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
>> <goal>install-file</goal>
>> </goals>
>> <configuration>
>> -
>> <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file> +
>>
>> <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-XXX-plugin</artifactId>
>> <version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT -->
>> <packaging>maven-plugin</packaging>
>> - <pomFile>${basedir}/pom.xml</pomFile>
>> + <pomFile>${project.basedir}/pom.xml</pomFile>
>> </configuration>
>> </execution>
>> </executions>
>> @@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
>> ...
>> <reporting>
>> <outputDirectory>
>> - ${basedir}/../../../../../target/it/it1/target/site
>> + ${project.basedir}/../../../../../target/it/it1/target/site
>> </outputDirectory>
>> <plugins>
>> <plugin>
>>
>> Modified: maven/site/trunk/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=158022
>> 0&r2=1580221&view=diff
>> ===========================================================================
>> === --- maven/site/trunk/pom.xml (original)
>> +++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
>> @@ -96,7 +96,7 @@
>> <artifactId>maven-site-plugin</artifactId>
>> <version>3.3</version>
>> <configuration>
>> - <siteDirectory>${basedir}/content</siteDirectory>
>> + <siteDirectory>${project.basedir}/content</siteDirectory>
>> </configuration>
>> <dependencies>
>> <dependency>
>> @@ -148,7 +148,7 @@
>>
>> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
>> <resources>
>> <resource>
>> -
>> <directory>${basedir}/content/filtered-resources</directory> +
>> <directory>${project.basedir}/content/filtered-resources</directory>
>> <filtering>true</filtering>
>> </resource>
>> </resources>
>> @@ -223,8 +223,8 @@
>> </goals>
>> <configuration>
>>
>> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
>> -
>> <siteDirectory>${basedir}/content</siteDirectory> -
>> <docDescriptor>${basedir}/content/pdf.xml</docDescriptor> +
>> <siteDirectory>${project.basedir}/content</siteDirectory> +
>> <docDescriptor>${project.basedir}/content/pdf.xml</docDescriptor>
>> </configuration>
>> </execution>
>> </executions>
>
>
> ---------------------------------------------------------------------
> 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
Re: svn commit: r1580221 - in /maven/site/trunk: content/apt/guides/mini/guide-using-ant.apt content/apt/plugin-developers/plugin-testing.apt pom.xml
Posted by Hervé BOUTEMY <he...@free.fr>.
well done
notice we should do something on profile activation, because ${basedir} is
supported here but not ${project.basedir}
see MNG-5590
IMHO, we should add support for ${project.basedir} in file-based profile
activation, and properly document this precise case in deprecation
documentation
WDYT?
Regards,
Hervé
Le samedi 22 mars 2014 15:09:32 khmarbaise@apache.org a écrit :
> Author: khmarbaise
> Date: Sat Mar 22 15:09:32 2014
> New Revision: 1580221
>
> URL: http://svn.apache.org/r1580221
> Log:
> [MNGSITE-197]
> - Fixed documentation and our own pom according
> to prevent using of ${basedir}. Better use
> ${project.basedir} instead.
>
> Modified:
> maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> maven/site/trunk/pom.xml
>
> Modified: maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> URL:
> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide
> -using-ant.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> ===========================================================================
> === --- maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> (original) +++ maven/site/trunk/content/apt/guides/mini/guide-using-ant.apt
> Sat Mar 22 15:09:32 2014 @@ -69,8 +69,8 @@ Guide to using Ant with Maven
> <configuration>
> <tasks>
> <exec
> - dir="${basedir}"
> - executable="${basedir}/src/main/sh/do-something.sh"
> + dir="${project.basedir}"
> +
> executable="${project.basedir}/src/main/sh/do-something.sh"
> failonerror="true">
> <arg line="arg1 arg2 arg3 arg4" />
> </exec>
> @@ -86,4 +86,4 @@ Guide to using Ant with Maven
> </build>
> </project>
>
> -+----+
> \ No newline at end of file
> ++----+
>
> Modified: maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> URL:
> http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-developers
> /plugin-testing.apt?rev=1580221&r1=1580220&r2=1580221&view=diff
> ===========================================================================
> === --- maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt
> (original) +++
> maven/site/trunk/content/apt/plugin-developers/plugin-testing.apt Sat Mar
> 22 15:09:32 2014 @@ -261,7 +261,7 @@ public class TrivialMavenVerifierTest
> ex
> <artifactId>maven-it-plugin</artifactId>
> <version>1.0-alpha-1-SNAPSHOT</version>
> <configuration>
> -
> <integrationTestsDirectory>${basedir}/src/it</integrationTestsDirectory> +
>
> <integrationTestsDirectory>${project.basedir}/src/it</integrationTestsDirec
> tory> <includes>
> <include>**/pom.xml</include>
> </includes>
> @@ -290,12 +290,12 @@ public class TrivialMavenVerifierTest ex
> <goal>install-file</goal>
> </goals>
> <configuration>
> -
> <file>${basedir}/target/maven-XXX-plugin-1.0-SNAPSHOT.jar</file> +
>
> <file>${project.build.directory}/maven-XXX-plugin-1.0-SNAPSHOT.jar</file>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-XXX-plugin</artifactId>
> <version>1.0-it-SNAPSHOT</version> <!-- IT SNAPSHOT -->
> <packaging>maven-plugin</packaging>
> - <pomFile>${basedir}/pom.xml</pomFile>
> + <pomFile>${project.basedir}/pom.xml</pomFile>
> </configuration>
> </execution>
> </executions>
> @@ -337,7 +337,7 @@ public class TrivialMavenVerifierTest ex
> ...
> <reporting>
> <outputDirectory>
> - ${basedir}/../../../../../target/it/it1/target/site
> + ${project.basedir}/../../../../../target/it/it1/target/site
> </outputDirectory>
> <plugins>
> <plugin>
>
> Modified: maven/site/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1580221&r1=158022
> 0&r2=1580221&view=diff
> ===========================================================================
> === --- maven/site/trunk/pom.xml (original)
> +++ maven/site/trunk/pom.xml Sat Mar 22 15:09:32 2014
> @@ -96,7 +96,7 @@
> <artifactId>maven-site-plugin</artifactId>
> <version>3.3</version>
> <configuration>
> - <siteDirectory>${basedir}/content</siteDirectory>
> + <siteDirectory>${project.basedir}/content</siteDirectory>
> </configuration>
> <dependencies>
> <dependency>
> @@ -148,7 +148,7 @@
>
> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
> <resources>
> <resource>
> -
> <directory>${basedir}/content/filtered-resources</directory> +
> <directory>${project.basedir}/content/filtered-resources</directory>
> <filtering>true</filtering>
> </resource>
> </resources>
> @@ -223,8 +223,8 @@
> </goals>
> <configuration>
>
> <outputDirectory>${project.reporting.outputDirectory}</outputDirectory> -
> <siteDirectory>${basedir}/content</siteDirectory> -
> <docDescriptor>${basedir}/content/pdf.xml</docDescriptor> +
> <siteDirectory>${project.basedir}/content</siteDirectory> +
> <docDescriptor>${project.basedir}/content/pdf.xml</docDescriptor>
> </configuration>
> </execution>
> </executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org