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 [email protected] 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: [email protected]
For additional commands, e-mail: [email protected]
